Merge branch 'develop'

siosio · Jan 9, 2019 · ab39e1d · ab39e1d
2 parents e22bf3c + 5f008fb
commit ab39e1d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,12 +8,13 @@ buildscript {
 }
 
 plugins {
-  id "org.jetbrains.intellij" version "0.3.10"
+  id "org.jetbrains.intellij" version "0.4.1"
 }
-
 apply plugin: 'java'
 apply plugin: "kotlin"
 
+version '1.13'
+
 intellij {
   pluginName 'Gradle Dependencies Helper'
   version = 'IC-2018.2.4'
@@ -33,8 +34,8 @@ repositories {
 }
 
 dependencies {
-  compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70"
-  testCompile 'junit:junit:4.12'
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70"
+  testImplementation 'junit:junit:4.12'
 }
 
 task wrapper(type: Wrapper) {

diff --git a/src/main/java/siosio/GradleDependenciesCompletionContributor.kt b/src/main/java/siosio/GradleDependenciesCompletionContributor.kt
@@ -20,8 +20,10 @@ class GradleDependenciesCompletionContributor : AbstractGradleCompletionContribu
                         .andOr(
                                 psiElement()
                                         .withParent(GrLiteral::class.java)
-                                        .withSuperParent(5, psiElement(GrMethodCallExpression::class.java)
-                                                .withText(containsDependencies)),
+                                        .andOr(
+                                                psiElement().withSuperParent(5, psiElement(GrMethodCallExpression::class.java).withText(containsDependencies)),
+                                                psiElement().withSuperParent(7, psiElement(GrMethodCallExpression::class.java).withText(containsDependencies))
+                                        ),
                                 psiElement()
                                         .withParent(GrStringContent::class.java)
                                         .withSuperParent(6, psiElement(GrMethodCallExpression::class.java)

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,6 @@
 <idea-plugin>
   <id>GradleDependenciesHelper</id>
   <name>Gradle Dependencies Helper</name>
-  <version>1.12</version>
   <vendor email="siosio12@gmail.com" url="https://github.com/siosio/GradleDependenciesHelperPlugin">siosio</vendor>
   <depends>org.jetbrains.plugins.gradle</depends>
   <depends>org.intellij.groovy</depends>
@@ -12,6 +11,9 @@
 
   <change-notes><![CDATA[
   <ul>
+  <li>1.13
+  Add  completion in 'platform' or 'enforcedPlatform'
+  </li>
     <li>1.8
     bug fix.<br/>
     <li>