diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-07-08 14:19:57 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-07-08 16:24:01 -0700 |
| commit | 281f88a2e2e0454ec6d6d25e1a3e3be7cf392db6 (patch) | |
| tree | 25b05c6fc84853c9d891119f7e2bd38667d8cd0d /plugins | |
| parent | ef7502c6805fa22f21ba2202dcc241a2c270bd4b (diff) | |
| download | idea-281f88a2e2e0454ec6d6d25e1a3e3be7cf392db6.tar.gz | |
More merge fixes
Restores
a85aa2665822cbccf9d8a2762744631ac68ffad7
765c6f92a0b59c34d5a146cecd891788edc53b5d
a8539f4dc6230fd9a9a2b5559f15fd7d0612d52e
45953b78139fc1565f651b571b2b9a17850e3dfb
9b4a9fe25888002718c525405ef135786c156ba7
6b0a26c7d627b9137ec98c2eb1c03639ebcbd667
I9abc64443af3a2ed65499de731943b0f7300746c (gerrit)
fbdba03ca1675559232a165427ffcc6ea6b37f58
2fd6821310bed531eb4a9a14b5ceccdddc3ba9dd
Change-Id: I095ab6072fc311c51305db7faa29a16e64fb9749
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/groovy/src/META-INF/plugin.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml index a296218e33c0..3b0e4dc1c0c1 100644 --- a/plugins/groovy/src/META-INF/plugin.xml +++ b/plugins/groovy/src/META-INF/plugin.xml @@ -197,7 +197,9 @@ <testGenerator language="Groovy" implementationClass="org.jetbrains.plugins.groovy.testIntegration.GroovyTestGenerator"/> <constructorBodyGenerator language="Groovy" implementationClass="org.jetbrains.plugins.groovy.annotator.intentions.dynamic.GrConstructorBodyGenerator"/> - <editorNotificationProvider implementation="org.jetbrains.plugins.groovy.annotator.ConfigureGroovyLibraryNotificationProvider"/> + <!-- In Android Studio, we don't want editor notifications to setup Groovy Path when *.gradle files are opened. This is a temporary + hack to remove this until we figure out how to disable it just for gradle scripts. + <editorNotificationProvider implementation="org.jetbrains.plugins.groovy.annotator.ConfigureGroovyLibraryNotificationProvider"/> --> <refactoring.introduceParameterMethodUsagesProcessor implementation="org.jetbrains.plugins.groovy.refactoring.introduce.parameter.java2groovy.GroovyIntroduceParameterMethodUsagesProcessor"/> <refactoring.changeSignatureUsageProcessor |