azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix project source to overcome bootstrap problem

Browse Source
This commit is contained in:
Denis Zharkov
2015-11-25 23:03:50 +03:00
parent c4bc2c9ba6
commit 0fd2484bc9
11 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class CallBasedArgumentGenerator extends ArgumentGenerator {
} }
@Override @Override
protected void reorderArgumentsIfNeeded(@NotNull List<? extends ArgumentAndDeclIndex> actualArgsWithDeclIndex) { protected void reorderArgumentsIfNeeded(@NotNull List actualArgsWithDeclIndex) {
callGenerator.reorderArgumentsIfNeeded(actualArgsWithDeclIndex, valueParameterTypes); callGenerator.reorderArgumentsIfNeeded(actualArgsWithDeclIndex, valueParameterTypes);
} }
} }
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -1559,7 +1559,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
} }
@Override @Override
protected void reorderArgumentsIfNeeded(@NotNull List<? extends ArgumentAndDeclIndex> args) { protected void reorderArgumentsIfNeeded(@NotNull List args) {
} }
} }
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java
+1 -1
View File
@@ -778,7 +778,7 @@ public class InlineCodegen extends CallGenerator {
@Override @Override
public void reorderArgumentsIfNeeded( public void reorderArgumentsIfNeeded(
@NotNull List<? extends ArgumentAndDeclIndex> actualArgsWithDeclIndex, @NotNull List<? extends Type> valueParameterTypes @NotNull List actualArgsWithDeclIndex, @NotNull List valueParameterTypes
) { ) {
} }
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/TabledDescriptorRenderer.java
+1 -1
View File
@@ -157,7 +157,7 @@ public class TabledDescriptorRenderer {
@NotNull @NotNull
public Renderer<KotlinType> getTypeRenderer() { public Renderer<KotlinType> getTypeRenderer() {
return Renderers.RENDER_TYPE; return (Renderer<KotlinType>) Renderers.RENDER_TYPE;
} }
protected void renderText(TextRenderer textRenderer, StringBuilder result) { protected void renderText(TextRenderer textRenderer, StringBuilder result) {
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java
+2 -2
View File
@@ -160,8 +160,8 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
@NotNull @NotNull
@Override @Override
public Collection<FqName> getSubPackagesOf( public Collection getSubPackagesOf(
@NotNull FqName fqName, @NotNull Function1<? super Name, ? extends Boolean> nameFilter @NotNull FqName fqName, @NotNull Function1 nameFilter
) { ) {
LazyPackageDescriptor packageDescriptor = getPackageFragment(fqName); LazyPackageDescriptor packageDescriptor = getPackageFragment(fqName);
if (packageDescriptor == null) { if (packageDescriptor == null) {
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
+2 -2
View File
@@ -262,9 +262,9 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
@NotNull @NotNull
@Override @Override
public Collection<DeclarationDescriptor> getContributedDescriptors( public Collection getContributedDescriptors(
@NotNull DescriptorKindFilter kindFilter, @NotNull DescriptorKindFilter kindFilter,
@NotNull Function1<? super Name, ? extends Boolean> nameFilter @NotNull Function1 nameFilter
) { ) {
return allDescriptors.invoke(); return allDescriptors.invoke();
} }
core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+6 -6
View File
@@ -77,8 +77,8 @@ public class ErrorUtils {
@NotNull @NotNull
@Override @Override
public Collection<FqName> getSubPackagesOf( public Collection getSubPackagesOf(
@NotNull FqName fqName, @NotNull Function1<? super Name, ? extends Boolean> nameFilter @NotNull FqName fqName, @NotNull Function1 nameFilter
) { ) {
return emptyList(); return emptyList();
} }
@@ -193,8 +193,8 @@ public class ErrorUtils {
@NotNull @NotNull
@Override @Override
public Collection<DeclarationDescriptor> getContributedDescriptors( public Collection getContributedDescriptors(
@NotNull DescriptorKindFilter kindFilter, @NotNull Function1<? super Name, ? extends Boolean> nameFilter @NotNull DescriptorKindFilter kindFilter, @NotNull Function1 nameFilter
) { ) {
return Collections.emptyList(); return Collections.emptyList();
} }
@@ -244,8 +244,8 @@ public class ErrorUtils {
@NotNull @NotNull
@Override @Override
public Collection<DeclarationDescriptor> getContributedDescriptors( public Collection getContributedDescriptors(
@NotNull DescriptorKindFilter kindFilter, @NotNull Function1<? super Name, ? extends Boolean> nameFilter @NotNull DescriptorKindFilter kindFilter, @NotNull Function1 nameFilter
) { ) {
throw new IllegalStateException(); throw new IllegalStateException();
} }
core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java
+11 -11
View File
@@ -151,15 +151,15 @@ public class LockBasedStorageManager implements StorageManager {
@NotNull @NotNull
@Override @Override
public <T> NotNullLazyValue<T> createLazyValueWithPostCompute( public NotNullLazyValue createLazyValueWithPostCompute(
@NotNull Function0<? extends T> computable, @NotNull Function0 computable,
final Function1<? super Boolean, ? extends T> onRecursiveCall, final Function1 onRecursiveCall,
@NotNull final Function1<? super T, ? extends Unit> postCompute @NotNull final Function1 postCompute
) { ) {
return new LockBasedNotNullLazyValue<T>(computable) { return new LockBasedNotNullLazyValue(computable) {
@NotNull @NotNull
@Override @Override
protected RecursionDetectedResult<T> recursionDetected(boolean firstTime) { protected RecursionDetectedResult recursionDetected(boolean firstTime) {
if (onRecursiveCall == null) { if (onRecursiveCall == null) {
return super.recursionDetected(firstTime); return super.recursionDetected(firstTime);
} }
@@ -167,7 +167,7 @@ public class LockBasedStorageManager implements StorageManager {
} }
@Override @Override
protected void postCompute(@NotNull T value) { protected void postCompute(@NotNull Object value) {
postCompute.invoke(value); postCompute.invoke(value);
} }
}; };
@@ -193,12 +193,12 @@ public class LockBasedStorageManager implements StorageManager {
@NotNull @NotNull
@Override @Override
public <T> NullableLazyValue<T> createNullableLazyValueWithPostCompute( public NullableLazyValue createNullableLazyValueWithPostCompute(
@NotNull Function0<? extends T> computable, @NotNull final Function1<? super T, ? extends Unit> postCompute @NotNull Function0 computable, @NotNull final Function1 postCompute
) { ) {
return new LockBasedLazyValue<T>(computable) { return new LockBasedLazyValue(computable) {
@Override @Override
protected void postCompute(@Nullable T value) { protected void postCompute(@Nullable Object value) {
postCompute.invoke(value); postCompute.invoke(value);
} }
}; };
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer {
@NotNull @NotNull
@Override @Override
public Renderer<KotlinType> getTypeRenderer() { public Renderer<KotlinType> getTypeRenderer() {
return IdeRenderers.HTML_RENDER_TYPE; return (Renderer<KotlinType>) IdeRenderers.HTML_RENDER_TYPE;
} }
@Override @Override
idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
+1 -1
View File
@@ -197,7 +197,7 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
BindingContext bindingContextForFile = resolutionFacade.analyzeFullyAndGetResult(Collections.singletonList(jetFile)).getBindingContext(); BindingContext bindingContextForFile = resolutionFacade.analyzeFullyAndGetResult(Collections.singletonList(jetFile)).getBindingContext();
kotlin.Pair<BindingContext, List<? extends KtFile>> result = DebuggerUtils.INSTANCE.analyzeInlinedFunctions( kotlin.Pair<BindingContext, List<KtFile>> result = (kotlin.Pair) DebuggerUtils.INSTANCE.analyzeInlinedFunctions(
resolutionFacade, bindingContextForFile, jetFile, !enableInline resolutionFacade, bindingContextForFile, jetFile, !enableInline
); );
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java
+2 -2
View File
@@ -390,7 +390,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
} }
private boolean isFullFileMove() { private boolean isFullFileMove() {
Map<KtFile, List<? extends KtNamedDeclaration>> fileToElements = CollectionsKt.groupBy( Map<KtFile, List<KtNamedDeclaration>> fileToElements = (Map) CollectionsKt.groupBy(
getSelectedElementsToMove(), getSelectedElementsToMove(),
new Function1<KtNamedDeclaration, KtFile>() { new Function1<KtNamedDeclaration, KtFile>() {
@Override @Override
@@ -399,7 +399,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
} }
} }
); );
for (Map.Entry<KtFile, List<? extends KtNamedDeclaration>> entry : fileToElements.entrySet()) { for (Map.Entry<KtFile, List<KtNamedDeclaration>> entry : fileToElements.entrySet()) {
if (entry.getKey().getDeclarations().size() != entry.getValue().size()) return false; if (entry.getKey().getDeclarations().size() != entry.getValue().size()) return false;
} }
return true; return true;