diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/IDELanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/IDELanguage.kt index 34f99d3c2..11ae8ad74 100644 --- a/editor/src/main/java/com/itsaky/androidide/editor/language/IDELanguage.kt +++ b/editor/src/main/java/com/itsaky/androidide/editor/language/IDELanguage.kt @@ -73,16 +73,13 @@ abstract class IDELanguage : Language { cancelChecker: CompletionCancelChecker, extraArguments: Bundle ) { - val server = languageServer - if (server == null) { - LOG.warn("Cannot provide completions. No language server available.") - return - } + val server = languageServer ?: return val path = extraArguments.getString(IEditor.KEY_FILE, null) if (path == null) { LOG.warn("Cannot provide completions. No file provided.") return } + val completionProvider = CommonCompletionProvider(server, cancelChecker) val file = Paths.get(path) val completionItems = completionProvider.complete(content, file, position) { checkIsCompletionChar(it) } diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/ProjectManagerImpl.kt b/subprojects/projects/src/main/java/com/itsaky/androidide/projects/ProjectManagerImpl.kt index 6d0b6fd72..02d6f1dc5 100644 --- a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/ProjectManagerImpl.kt +++ b/subprojects/projects/src/main/java/com/itsaky/androidide/projects/ProjectManagerImpl.kt @@ -158,7 +158,7 @@ class ProjectManagerImpl : IProjectManager, EventReceiver { } override fun findModuleForFile(file: File, checkExistance: Boolean): ModuleProject? { - if (!checkInit()) { + if (!isInitialized()) { return null } @@ -166,7 +166,7 @@ class ProjectManagerImpl : IProjectManager, EventReceiver { } override fun containsSourceFile(file: Path): Boolean { - if (!checkInit()) { + if (!isInitialized()) { return false } @@ -302,15 +302,6 @@ class ProjectManagerImpl : IProjectManager, EventReceiver { private fun isInitialized() = rootProject != null - private fun checkInit(): Boolean { - if (isInitialized()) { - return true - } - - log.warn("GradleProject is not initialized yet!") - return false - } - private fun generateSourcesIfNecessary(event: FileEvent) { val builder = Lookup.getDefault().lookup(BuildService.KEY_BUILD_SERVICE) ?: return val file = event.file