diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/platform-resources/src/META-INF/PlatformExtensions.xml | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-resources/src/META-INF/PlatformExtensions.xml')
| -rw-r--r-- | platform/platform-resources/src/META-INF/PlatformExtensions.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index 7aa76abcd4f8..467ef8233919 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -239,6 +239,10 @@ <applicationService serviceInterface="com.intellij.ui.ColorChooserService" serviceImplementation="com.intellij.ui.ColorChooserServiceImpl"/> + <applicationService serviceInterface="com.intellij.openapi.actionSystem.AbbreviationManager" + serviceImplementation="com.intellij.openapi.actionSystem.impl.AbbreviationManagerImpl"/> + <exportable serviceInterface="com.intellij.openapi.actionSystem.AbbreviationManager"/> + <scopeParserExtension implementation="com.intellij.psi.search.scope.packageSet.FilePackageSetParserExtension"/> <applicationService serviceInterface="com.intellij.openapi.ui.popup.StackingPopupDispatcher" serviceImplementation="com.intellij.ui.popup.StackingPopupDispatcherImpl"/> |