From 493a2006f10b4548ce4fdb81135ab133e1676394 Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Thu, 21 Mar 2019 12:04:04 +0000 Subject: [PATCH] Remove unused SimpleDirtyData from incremental compilation This is not used any more and all information about the changed symbols and fqNames is passed alongside artifacts. --- .../IncrementalCompilationServicesFacade.kt | 17 +-------- .../daemon/incremental/dirtyDataUtils.kt | 35 ------------------- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/dirtyDataUtils.kt diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/IncrementalCompilationServicesFacade.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/IncrementalCompilationServicesFacade.kt index 06bd30fa347..1e90b175c1f 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/IncrementalCompilationServicesFacade.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/IncrementalCompilationServicesFacade.kt @@ -60,19 +60,4 @@ interface IncrementalCompilationServicesFacade : Remote { @Throws(RemoteException::class) fun revert() - - // ChangesRegistry - @Throws(RemoteException::class) - fun registerChanges(timestamp: Long, dirtyData: SimpleDirtyData) - - @Throws(RemoteException::class) - fun unknownChanges(timestamp: Long) - - @Throws(RemoteException::class) - fun getChanges(artifact: File, sinceTS: Long): Iterable? -} - -class SimpleDirtyData( - val dirtyLookupSymbols: List, - val dirtyClassesFqNames: List -) : Serializable \ No newline at end of file +} \ No newline at end of file diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/dirtyDataUtils.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/dirtyDataUtils.kt deleted file mode 100644 index 57b7ad400e3..00000000000 --- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/dirtyDataUtils.kt +++ /dev/null @@ -1,35 +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.daemon.incremental - -import org.jetbrains.kotlin.daemon.common.SimpleDirtyData -import org.jetbrains.kotlin.incremental.DirtyData -import org.jetbrains.kotlin.incremental.LookupSymbol -import org.jetbrains.kotlin.name.FqName - -fun SimpleDirtyData.toDirtyData(): DirtyData { - val dirtyClassesFqNames = dirtyClassesFqNames.map(::FqName) - val dirtyLookupSymbols = dirtyLookupSymbols.map { - LookupSymbol(scope = it.substringBeforeLast("."), name = it.substringAfterLast(".")) - } - return DirtyData(dirtyLookupSymbols, dirtyClassesFqNames) -} - -fun DirtyData.toSimpleDirtyData(): SimpleDirtyData { - return SimpleDirtyData(dirtyClassesFqNames = dirtyClassesFqNames.map(FqName::asString), - dirtyLookupSymbols = dirtyLookupSymbols.map { "${it.scope}.${it.name}" }) -} \ No newline at end of file