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

(cherry picked from commit 0fc15178cb6ea77bf6b54cf43d9ac4c9c4c48bc5)

Change-Id: I0fc15178cb6ea77bf6b54cf43d9ac4c9c4c48bc5

1 files changed, 7 insertions, 14 deletions

diff --git a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt
index 366ab197c0e..fa2949d30dd 100644
--- a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt
+++ b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt
@@ -16,7 +16,6 @@
 package com.android.tools.idea.lint
 
 import com.android.SdkConstants.ANDROID_MANIFEST_XML
-import com.android.SdkConstants.DOT_GRADLE
 import com.android.ide.common.repository.GradleCoordinate
 import com.android.ide.common.repository.GradleVersion
 import com.android.ide.common.repository.SdkMavenRepository
@@ -48,7 +47,6 @@ import com.android.tools.lint.client.api.IssueRegistry
 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
 import com.google.wireless.android.sdk.stats.LintSession
 import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.codeInspection.LocalQuickFix
@@ -70,7 +68,7 @@ import org.jetbrains.android.facet.AndroidFacet
 import org.jetbrains.android.resourceManagers.ModuleResourceManagers
 import org.jetbrains.annotations.VisibleForTesting
 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
 
@@ -157,18 +155,13 @@ class AndroidLintIdeSupport : LintIdeSupport() {
     else if (fileType === FileTypes.PLAIN_TEXT) {
       return super.canAnnotate(file, module)
     }
-    else if (fileType === GroovyFileType.GROOVY_FILE_TYPE) {
-      if (!SdkUtils.endsWithIgnoreCase(file.name, DOT_GRADLE)) {
-        return false
-      }
-      else {
-        // Ensure that we're listening to the PSI structure for Gradle file edit notifications
-        val project = file.project
-        if (AndroidProjectInfo.getInstance(project).requiresAndroidModel()) {
-          AndroidFileChangeListener.getInstance(project)
-        }
-        return true
+    else if (file.isGradleFile()) {
+      // Ensure that we're listening to the PSI structure for Gradle file edit notifications
+      val project = file.project
+      if (AndroidProjectInfo.getInstance(project).requiresAndroidModel()) {
+        AndroidFileChangeListener.getInstance(project)
       }
+      return true
     }
     return false
   }