From 4626531f95e60e03086da163cde5edf5411a8d9b Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Thu, 9 Nov 2017 21:43:37 +0300
Subject: Drop dependency on intellij-core-analysis

Instead of it, download idea.jar and manually strip it
Also, depends on same as kotlin-compiler openapi version
---
 core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'core/src/main/kotlin')

diff --git a/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt b/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt
index 21f7e2da..2f2f94b3 100644
--- a/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt
+++ b/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt
@@ -32,7 +32,11 @@ import java.io.File
  * classes from projectModel-{api,impl}.
  */
 class CoreProjectFileIndex(private val project: Project, contentRoots: List<ContentRoot>) : ProjectFileIndex, ModuleFileIndex {
-    override fun iterateContentUnderDirectory(p0: VirtualFile, p1: ContentIterator, p2: VirtualFileFilter): Boolean {
+    override fun iterateContent(p0: ContentIterator, p1: VirtualFileFilter?): Boolean {
+        throw UnsupportedOperationException()
+    }
+
+    override fun iterateContentUnderDirectory(p0: VirtualFile, p1: ContentIterator, p2: VirtualFileFilter?): Boolean {
         throw UnsupportedOperationException()
     }
 
@@ -74,7 +78,7 @@ class CoreProjectFileIndex(private val project: Project, contentRoots: List<Cont
             throw UnsupportedOperationException()
         }
 
-        override fun setOption(p0: String, p1: String) {
+        override fun setOption(p0: String, p1: String?) {
             throw UnsupportedOperationException()
         }
 
@@ -288,11 +292,11 @@ class CoreProjectFileIndex(private val project: Project, contentRoots: List<Cont
             throw UnsupportedOperationException()
         }
 
-        override fun getRootFiles(p0: OrderRootType?): Array<out VirtualFile>? {
+        override fun getRootFiles(p0: OrderRootType): Array<out VirtualFile> {
             throw UnsupportedOperationException()
         }
 
-        override fun getRootUrls(p0: OrderRootType?): Array<out String>? {
+        override fun getRootUrls(p0: OrderRootType): Array<out String> {
             throw UnsupportedOperationException()
         }
 
@@ -307,6 +311,10 @@ class CoreProjectFileIndex(private val project: Project, contentRoots: List<Cont
     }
 
     inner class MyModuleRootManager : ModuleRootManager() {
+        override fun getExternalSource(): ProjectModelExternalSource? {
+            throw UnsupportedOperationException()
+        }
+
         override fun getExcludeRoots(): Array<out VirtualFile> {
             throw UnsupportedOperationException()
         }
-- 
cgit