Use source.gradle-kotlin-dsl for Kotlin grammar

Author: fwcd

language-support/kotlin/kotlin.tmLanguage.json

@@ -1,10 +1,11 @@
 {
     "information_for_contributors": [
-        "This file has been copied from https://github.com/eclipse/buildship/blob/b848d9a08283b68860671a73ceec3c99bdab27c2/org.eclipse.buildship.kotlindsl.provider/kotlin.tmLanguage.json"
+        "This file has been copied from https://github.com/eclipse/buildship/blob/b848d9a08283b68860671a73ceec3c99bdab27c2/org.eclipse.buildship.kotlindsl.provider/kotlin.tmLanguage.json",
+		"NOTE: This uses the scope 'source.gradle-kotlin-dsl' rather than 'source.kotlin' to avoid conflicts with other Kotlin grammars."
     ],
     "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
-    "name": "Kotlin",
-    "scopeName": "source.kotlin",
+    "name": "Gradle Kotlin DSL",
+    "scopeName": "source.gradle-kotlin-dsl",
     "patterns": [
         {
             "include": "#import"
@@ -698,4 +699,4 @@
             "name": "variable.language.this.kotlin"
         }
     }
-}
+}

package.json

@@ -210,7 +210,7 @@
       },
       {
         "language": "gradle-kotlin-dsl",
-        "scopeName": "source.kotlin",
+        "scopeName": "source.gradle-kotlin-dsl",
         "path": "./language-support/kotlin/kotlin.tmLanguage.json"
       },
       {