diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /plugins/devkit/testData/codeInsight/ExtensionsHighlighting.xml | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'plugins/devkit/testData/codeInsight/ExtensionsHighlighting.xml')
| -rw-r--r-- | plugins/devkit/testData/codeInsight/ExtensionsHighlighting.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/devkit/testData/codeInsight/ExtensionsHighlighting.xml b/plugins/devkit/testData/codeInsight/ExtensionsHighlighting.xml index 9486bf492542..d0e7a9b31296 100644 --- a/plugins/devkit/testData/codeInsight/ExtensionsHighlighting.xml +++ b/plugins/devkit/testData/codeInsight/ExtensionsHighlighting.xml @@ -14,7 +14,7 @@ <myPlugin.ext implementation="<error descr="'java.util.concurrent.TimeUnit' is not assignable to 'java.lang.Runnable'"><error descr="Enum is not allowed">java.util.concurrent.TimeUnit</error></error>"/> <myPlugin.ext implementation="<error descr="'java.lang.String' is not assignable to 'java.lang.Runnable'">java.lang.String</error>"/> - <warning descr="Deprecated EP" textAttributesKey="DEPRECATED_ATTRIBUTES"><myPlugin.deprecatedEP implementation="foo.MyDeprecatedEPImpl"/></warning> + <<error descr="Deprecated EP">myPlugin.deprecatedEP</error> implementation="foo.MyDeprecatedEPImpl"/> <myPlugin.foo.bar/> <completion.contributor/> |