From 1021677fcfca33e79947aa2cc5b8cb433ee1a408 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Mon, 27 Nov 2017 19:29:34 +0300
Subject: [PATCH] [gradle] use new imports API (convert source)

---
 .../config/GradleDefaultImportContributor.kt  | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleDefaultImportContributor.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleDefaultImportContributor.kt
index adad2c76cb11..944b3e68f37a 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleDefaultImportContributor.kt
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleDefaultImportContributor.kt
@@ -1,18 +1,15 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.plugins.gradle.config;
+package org.jetbrains.plugins.gradle.config
 
-import org.jetbrains.annotations.NotNull
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
+import org.jetbrains.plugins.groovy.lang.resolve.imports.GrImportContributor
+import org.jetbrains.plugins.groovy.lang.resolve.imports.GroovyImport
+import org.jetbrains.plugins.groovy.lang.resolve.imports.StarImport
 import org.jetbrains.plugins.groovy.runner.GroovyScriptUtil
-import java.util.*
 
-/**
- * @author peter
- */
-public class GradleDefaultImportContributor extends GrImportContributorBase {
+class GradleDefaultImportContributor : GrImportContributor {
 
-  // As listed here - http://www.gradle.org/docs/current/userguide/userguide_single.html#sec:using_gradle_without_ide_support
-  public static final String[] IMPLICIT_GRADLE_PACKAGES = {
+  private val imports = arrayOf(
     "org.gradle",
     "org.gradle.api",
     "org.gradle.api.artifacts",
@@ -185,15 +182,14 @@ public class GradleDefaultImportContributor extends GrImportContributorBase {
     "org.gradle.testing.jacoco.plugins",
     "org.gradle.testing.jacoco.tasks",
     "org.gradle.util"
-  };
+  ).map(::StarImport)
 
-
-  @NotNull
-  @Override
-  public List<String> appendImplicitlyImportedPackages(@NotNull GroovyFile file) {
-    if (file.isScript() && GroovyScriptUtil.getScriptType(file) instanceof GradleScriptType) {
-      return Arrays.asList(IMPLICIT_GRADLE_PACKAGES);
+  override fun getFileImports(file: GroovyFile): List<GroovyImport> {
+    return if (file.isScript && GroovyScriptUtil.getScriptType(file) is GradleScriptType) {
+      imports
+    }
+    else {
+      emptyList()
     }
-    return Collections.emptyList();
   }
 }