[Gradle] Add separate language filetype for Gradle script files IDEA-276227

(cherry picked from commit 0fc15178cb6ea77bf6b54cf43d9ac4c9c4c48bc5)

Change-Id: I0fc15178cb6ea77bf6b54cf43d9ac4c9c4c48bc5

3 files changed, 7 insertions, 7 deletions

diff --git a/lint/src/com/android/tools/idea/lint/common/LintExternalAnnotator.kt b/lint/src/com/android/tools/idea/lint/common/LintExternalAnnotator.kt
index 841708c7cc2..44429fbdd3c 100644
--- a/lint/src/com/android/tools/idea/lint/common/LintExternalAnnotator.kt
+++ b/lint/src/com/android/tools/idea/lint/common/LintExternalAnnotator.kt
@@ -63,7 +63,7 @@ import com.intellij.psi.PsiFile
 import com.intellij.util.IncorrectOperationException
 import com.intellij.xml.util.XmlStringUtil
 import org.jetbrains.kotlin.idea.KotlinFileType
-import org.jetbrains.plugins.groovy.GroovyFileType
+import org.jetbrains.plugins.gradle.config.GradleFileType
 import java.util.EnumSet
 import javax.swing.Icon
 
@@ -169,7 +169,7 @@ class LintExternalAnnotator : ExternalAnnotator<LintEditorResult, LintEditorResu
         }
       } else if (name == OLD_PROGUARD_FILE || name == FN_PROJECT_PROGUARD_FILE) {
         scope = EnumSet.of(Scope.PROGUARD_FILE)
-      } else if (fileType === GroovyFileType.GROOVY_FILE_TYPE) {
+      } else if (GradleFileType.isGradleFile(mainFile)) {
         scope = Scope.GRADLE_SCOPE
       } else if (fileType === PropertiesFileType.INSTANCE) {
         scope = Scope.PROPERTY_SCOPE
diff --git a/lint/src/com/android/tools/idea/lint/common/LintIdeSupport.kt b/lint/src/com/android/tools/idea/lint/common/LintIdeSupport.kt
index 3e699e721cd..3143dd4b749 100644
--- a/lint/src/com/android/tools/idea/lint/common/LintIdeSupport.kt
+++ b/lint/src/com/android/tools/idea/lint/common/LintIdeSupport.kt
@@ -15,7 +15,6 @@
  */
 package com.android.tools.idea.lint.common
 
-import com.android.SdkConstants.DOT_GRADLE
 import com.android.ide.common.repository.GradleCoordinate
 import com.android.ide.common.repository.GradleVersion
 import com.android.tools.lint.client.api.IssueRegistry
@@ -24,7 +23,6 @@ import com.android.tools.lint.client.api.LintClient.Companion.CLIENT_STUDIO
 import com.android.tools.lint.client.api.LintDriver
 import com.android.tools.lint.detector.api.Issue
 import com.android.tools.lint.detector.api.Platform
-import com.android.utils.SdkUtils.endsWithIgnoreCase
 import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.ide.highlighter.JavaFileType
@@ -40,7 +38,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.xml.XmlFile
 import org.jetbrains.kotlin.idea.KotlinFileType
-import org.jetbrains.plugins.groovy.GroovyFileType
+import org.jetbrains.plugins.gradle.config.isGradleFile
 import java.io.File
 import java.util.EnumSet
 
@@ -92,7 +90,7 @@ abstract class LintIdeSupport {
       val name = file.name
       return name == "proguard-project.txt" || name == "proguard-android.txt" || name == "proguard.cfg"
     }
-    else if (fileType === GroovyFileType.GROOVY_FILE_TYPE && endsWithIgnoreCase(file.name, DOT_GRADLE)) {
+    else if (file.isGradleFile()) {
       return true
     }
     return false
diff --git a/lint/src/com/android/tools/idea/lint/common/SuppressLintIntentionAction.kt b/lint/src/com/android/tools/idea/lint/common/SuppressLintIntentionAction.kt
index 7e6b45648ea..d85f39d7181 100644
--- a/lint/src/com/android/tools/idea/lint/common/SuppressLintIntentionAction.kt
+++ b/lint/src/com/android/tools/idea/lint/common/SuppressLintIntentionAction.kt
@@ -28,6 +28,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.util.IncorrectOperationException
 import org.jetbrains.kotlin.idea.KotlinFileType
+import org.jetbrains.plugins.gradle.config.GradleFileType
 import org.jetbrains.plugins.groovy.GroovyFileType
 import javax.swing.Icon
 
@@ -49,7 +50,8 @@ class SuppressLintIntentionAction(private val id: String, element: PsiElement) :
 
   override fun isAvailable(project: Project, editor: Editor, file: PsiFile): Boolean {
     val type = file.fileType
-    return type === JavaFileType.INSTANCE || type === XmlFileType.INSTANCE || type === GroovyFileType.GROOVY_FILE_TYPE ||
+    return type === JavaFileType.INSTANCE || type === XmlFileType.INSTANCE ||
+           type === GroovyFileType.GROOVY_FILE_TYPE || type === GradleFileType ||
            type === KotlinFileType.INSTANCE || file is PsiBinaryFile
   }