Merge branch 'diff' idea/134.1156
authorAleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Mon, 17 Feb 2014 15:37:00 +0000 (19:37 +0400)
committerAleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Mon, 17 Feb 2014 15:37:00 +0000 (19:37 +0400)
893 files changed:
build/scripts/libLicenses.gant
images/src/META-INF/ImagesPlugin.xml
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexFeature.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexFeaturesHolder.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/api/index/ClassFilesIndexReaderBase.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/CachedRelevantStaticMethodSearcher.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ChainsSearcher.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodChainsSearchUtil.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodsChain.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/MethodsChainLookupRangingHelper.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/ParametersMatcher.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/completion/MethodsChainsCompletionContributor.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ChainCompletionContext.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/ContextUtil.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/MethodIncompleteSignatureResolver.java
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/chainsSearch/context/TargetType.java [new file with mode: 0644]
java/compiler/impl/src/com/intellij/compiler/classFilesIndex/impl/MethodsUsageIndexReader.java
java/compiler/openapi/src/com/intellij/openapi/compiler/util/InspectionValidator.java
java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionComboBox.java
java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java
java/idea-ui/src/com/intellij/facet/impl/ui/libraries/EditLibraryDialog.java
java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/impl/FrameworkSupportModelBase.java
java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryDialog.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/EditExistingLibraryDialog.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
java/java-impl/src/com/intellij/application/options/editor/JavaCodeFoldingOptionsProvider.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingMethodBodyFixer.java
java/java-impl/src/com/intellij/openapi/roots/libraries/LibrariesHelperImpl.java
java/java-impl/src/com/intellij/pom/java/impl/PomJavaAspectImpl.java [deleted file]
java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java
java/java-impl/src/com/intellij/slicer/SlicePanel.java
java/java-impl/src/com/intellij/usageView/UsageContextDataflowFromPanel.java
java/java-impl/src/com/intellij/usageView/UsageContextDataflowToPanel.java
java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotatedElementsSearch.java
java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerBase.java
java/java-psi-api/src/com/intellij/codeInsight/folding/JavaCodeFoldingSettings.java
java/java-psi-api/src/com/intellij/patterns/PsiJavaPatterns.java
java/java-psi-api/src/com/intellij/patterns/PsiMethodCallPattern.java
java/java-psi-api/src/com/intellij/psi/JavaPsiFacade.java
java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceExpression.java
java/java-psi-api/src/com/intellij/psi/PsiNameHelper.java
java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsBase.java
java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java
java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java
java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java
java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowFactory.java
java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/PsiNameHelperImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/file/impl/JavaFileManager.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/CheckedExceptionCompatibilityConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/LambdaExpressionCompatibilityConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/PsiMethodReferenceCompatibilityConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
java/java-tests/testData/codeInsight/completeStatement/MethodBeforeCommentField.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/completeStatement/MethodBeforeCommentField_after.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/completeStatement/MethodBeforeCommentMethod.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/completeStatement/MethodBeforeCommentMethod_after.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/InStaticImport-result.java
java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/InStaticImport-source.java
java/java-tests/testData/codeInsight/completion/methodChains/testArrayReturnType/TestCompletion.java [moved from java/openapi/src/com/intellij/pom/java/PomJavaAspect.java with 51% similarity]
java/java-tests/testData/codeInsight/completion/methodChains/testArrayReturnType/TestIndex.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/InferenceFromNotEqualTypeParamsBounds.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AmbiguityRawGenerics.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lossyEncoding/InconsistentLineSeparators.txt [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lossyEncoding/Win1251.txt [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass/beforeAnonymousClassArgument.java
java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java
java/java-tests/testSrc/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessorTest.java
java/java-tests/testSrc/com/intellij/codeInsight/completion/AbstractCompilerAwareTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LossyEncodingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java
java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy
java/java-tests/testSrc/com/intellij/concurrency/JobUtilTest.java
java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
java/java-tests/testSrc/com/intellij/index/IndexTest.java
java/java-tests/testSrc/com/intellij/projectView/NavigateFromSourceTest.java
java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy
java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java
java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
java/testFramework/src/com/intellij/codeInsight/EditorInfo.java
java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
jps/jps-builders/src/org/jetbrains/jps/classFilesIndex/AsmUtil.java
jps/jps-builders/src/org/jetbrains/jps/classFilesIndex/indexer/api/ClassFilesIndexStorage.java
jps/jps-builders/src/org/jetbrains/jps/classFilesIndex/indexer/api/ClassFilesIndexWriter.java
jps/jps-builders/src/org/jetbrains/jps/classFilesIndex/indexer/api/ClassFilesIndicesBuilder.java
jps/jps-builders/src/org/jetbrains/jps/classFilesIndex/indexer/impl/MethodIncompleteSignature.java
jps/jps-builders/src/org/jetbrains/jps/classFilesIndex/indexer/impl/MethodsUsageIndexer.java
lib/required_for_dist.txt
platform/bootstrap/src/com/intellij/idea/Main.java
platform/core-api/src/com/intellij/openapi/util/AsyncResult.java
platform/core-api/src/com/intellij/patterns/ObjectPattern.java
platform/core-api/src/com/intellij/patterns/TreeElementPattern.java
platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
platform/core-api/src/com/intellij/usageView/UsageInfo.java
platform/core-api/src/com/intellij/util/ArrayQuery.java
platform/core-api/src/com/intellij/util/InstanceofQuery.java
platform/core-impl/src/com/intellij/concurrency/JobLauncher.java
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
platform/core-impl/src/com/intellij/lang/folding/NamedFoldingDescriptor.java [new file with mode: 0644]
platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java
platform/editor-ui-api/src/com/intellij/openapi/editor/Caret.java
platform/editor-ui-api/src/com/intellij/openapi/editor/CaretAction.java [new file with mode: 0644]
platform/editor-ui-api/src/com/intellij/openapi/editor/CaretModel.java
platform/editor-ui-api/src/com/intellij/openapi/editor/EditorSettings.java
platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java
platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java
platform/external-system-impl/external-system-impl.iml
platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/AbstractExternalSystemTest.groovy
platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/KeywordParser.java
platform/lang-api/src/com/intellij/execution/RunProfileStarter.java
platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java
platform/lang-api/src/com/intellij/execution/configurations/MockCommandLineState.java
platform/lang-api/src/com/intellij/execution/configurations/RunConfiguration.java
platform/lang-api/src/com/intellij/execution/configurations/RunProfileState.java
platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfigurationWarning.java
platform/lang-api/src/com/intellij/execution/runners/AsyncGenericProgramRunner.java
platform/lang-api/src/com/intellij/execution/runners/BaseProgramRunner.java
platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java
platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java
platform/lang-api/src/com/intellij/execution/ui/ConsoleView.java
platform/lang-api/src/com/intellij/facet/frameworks/actions/AbstractAction.java
platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java
platform/lang-api/src/com/intellij/lang/parameterInfo/ParameterInfoUtils.java
platform/lang-api/src/com/intellij/psi/impl/include/FileIncludeManager.java
platform/lang-api/src/com/intellij/semantic/SemKey.java
platform/lang-api/src/com/intellij/usageView/UsageViewBundle.java
platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java
platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyHandler.java
platform/lang-impl/src/com/intellij/codeInsight/editorActions/CutHandler.java
platform/lang-impl/src/com/intellij/codeInsight/editorActions/PasteHandler.java
platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java
platform/lang-impl/src/com/intellij/codeInsight/highlighting/ChooseOneOrAllRunnable.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/BackspaceHandler.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/EndHandler.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/HomeHandler.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupActionHandler.java
platform/lang-impl/src/com/intellij/codeInsight/navigation/IncrementalSearchHandler.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java
platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java
platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
platform/lang-impl/src/com/intellij/execution/configuration/EmptyRunProfileState.java
platform/lang-impl/src/com/intellij/execution/console/BaseConsoleExecuteActionHandler.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java [moved from platform/lang-impl/src/com/intellij/execution/runners/ConsoleExecuteAction.java with 86% similarity]
platform/lang-impl/src/com/intellij/execution/console/ConsoleGutterComponent.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java
platform/lang-impl/src/com/intellij/execution/console/FoldLinesLikeThis.java
platform/lang-impl/src/com/intellij/execution/console/GutterContentProvider.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java
platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
platform/lang-impl/src/com/intellij/execution/runners/BaseConsoleExecuteActionHandler.java
platform/lang-impl/src/com/intellij/execution/runners/ConsoleExecuteActionHandler.java
platform/lang-impl/src/com/intellij/execution/runners/LanguageConsoleBuilder.java [deleted file]
platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
platform/lang-impl/src/com/intellij/ide/actions/ApplyIntentionAction.java
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
platform/lang-impl/src/com/intellij/injected/editor/CaretModelWindow.java
platform/lang-impl/src/com/intellij/lang/SmartEnterProcessorWithFixers.java
platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java
platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java
platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeManagerImpl.java
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/ClassMapCachingNulls.java
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java
platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.java
platform/lang-impl/src/com/intellij/refactoring/ui/AbstractMemberSelectionTable.java
platform/lang-impl/src/com/intellij/usageView/impl/UsageContextCallHierarchyPanel.java
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
platform/lang-impl/src/com/intellij/util/indexing/IndexingStamp.java
platform/lang-impl/src/com/intellij/util/indexing/ValueContainerImpl.java
platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java
platform/platform-api/src/com/intellij/execution/configurations/EncodingEnvironmentUtil.java
platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java
platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java
platform/platform-api/src/com/intellij/openapi/editor/EditorModificationUtil.java
platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorAction.java
platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorActionHandler.java
platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorWriteActionHandler.java
platform/platform-api/src/com/intellij/openapi/editor/actionSystem/TypedAction.java
platform/platform-api/src/com/intellij/openapi/ui/MessageDialogBuilder.java
platform/platform-api/src/com/intellij/ui/CollectionListModel.java
platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java
platform/platform-api/src/com/intellij/ui/mac/MacMessages.java
platform/platform-api/src/com/intellij/ui/mac/MacMessagesEmulation.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java
platform/platform-impl/src/com/intellij/diagnostic/errordialog/CommentsTabForm.form
platform/platform-impl/src/com/intellij/diagnostic/errordialog/CommentsTabForm.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginsTableRenderer.form
platform/platform-impl/src/com/intellij/ide/plugins/PluginsTableRenderer.java
platform/platform-impl/src/com/intellij/openapi/diff/actions/ToggleAutoScrollAction.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/util/SyncScrollSupport.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/CloneCaretAbove.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/CloneCaretBelow.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/ContentChooser.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/CopyAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/CutAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/EscapeAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/MoveCaretDownWithSelectionAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/MoveCaretUpWithSelectionAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/PageDownWithSelectionAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/PageUpWithSelectionAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/StartNewLineBeforeAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/TextEndWithSelectionAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/TextStartWithSelectionAction.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/SettingsImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaret.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaretModel.java
platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentEditor.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.java
platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java
platform/platform-impl/src/com/intellij/openapi/project/impl/DefaultProject.java
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/vfs/ex/dummy/DummyCachingFileSystem.java
platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java
platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java
platform/platform-impl/src/com/intellij/ui/mac/MacMessagesImpl.java
platform/platform-impl/src/com/intellij/ui/messages/JBMacMessages.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ui/messages/SheetController.java [new file with mode: 0755]
platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java [new file with mode: 0755]
platform/platform-impl/src/com/intellij/util/graph/impl/KShortestPathsFinder.java
platform/platform-impl/src/org/jetbrains/ide/BuiltInServerManagerImpl.java
platform/platform-resources-en/src/messages/ApplicationBundle.properties
platform/platform-resources-en/src/messages/DiagnosticBundle.properties
platform/platform-resources-en/src/messages/DiffBundle.properties
platform/platform-resources-en/src/messages/DomBundle.properties
platform/platform-resources-en/src/messages/FindBundle.properties
platform/platform-resources-en/src/messages/IdeBundle.properties
platform/platform-resources-en/src/messages/UsageView.properties
platform/platform-resources-en/src/misc/registry.properties
platform/platform-resources/src/META-INF/LangExtensions.xml
platform/platform-resources/src/META-INF/PlatformPlugin.xml
platform/platform-resources/src/brokenPlugins.txt
platform/platform-tests/testData/editor/multiCaret/$SelectAll-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/$SelectAll-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorBackSpace-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorBackSpace-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCloneCaretAbove-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCloneCaretAbove-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCloneCaretBelow-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCloneCaretBelow-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCodeBlockEnd-after.java [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCodeBlockEnd-before.java [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCodeBlockEndWithSelection-after.java [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCodeBlockEndWithSelection-before.java [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCodeBlockStart-after.java [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCodeBlockStart-before.java [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCodeBlockStartWithSelection-after.java [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCodeBlockStartWithSelection-before.java [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDelete-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDelete-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDeleteLine-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDeleteLine-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDeleteToWordEnd-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDeleteToWordEnd-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDeleteToWordEndInDifferentHumpsMode-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDeleteToWordEndInDifferentHumpsMode-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDeleteToWordStart-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDeleteToWordStart-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDeleteToWordStartInDifferentHumpsMode-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDeleteToWordStartInDifferentHumpsMode-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDown-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDown-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDownWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDownWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDuplicate-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDuplicate-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDuplicateLines-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorDuplicateLines-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorEnter-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorEnter-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorEscape-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorEscape-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorIndentLineOrSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorIndentLineOrSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorIndentSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorIndentSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorJoinLines-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorJoinLines-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLeft-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLeft-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLeftWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLeftWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLineEnd-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLineEnd-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLineEndWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLineEndWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLineStart-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLineStart-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLineStartWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorLineStartWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorMatchBrace-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorMatchBrace-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorNextWord-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorNextWord-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorNextWordInDifferentHumpsMode-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorNextWordInDifferentHumpsMode-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorNextWordInDifferentHumpsModeWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorNextWordInDifferentHumpsModeWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorNextWordWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorNextWordWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageDown-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageDown-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageDownWithSelection-1-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageDownWithSelection-1-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageDownWithSelection-2-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageDownWithSelection-2-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageUp-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageUp-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageUpWithSelection-1-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageUpWithSelection-1-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageUpWithSelection-2-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPageUpWithSelection-2-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPreviousWord-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPreviousWord-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPreviousWordInDifferentHumpsMode-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPreviousWordInDifferentHumpsMode-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPreviousWordInDifferentHumpsModeWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPreviousWordInDifferentHumpsModeWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPreviousWordWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorPreviousWordWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorRight-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorRight-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorRightWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorRightWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorSelectWord-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorSelectWord-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorStartNewLine-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorStartNewLine-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorStartNewLineBefore-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorStartNewLineBefore-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorSwapSelectionBoundaries-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorSwapSelectionBoundaries-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorTab-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorTab-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorTextEnd-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorTextEnd-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorTextEndWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorTextEndWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorTextStart-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorTextStart-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorTextStartWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorTextStartWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorToggleCase-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorToggleCase-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorUnSelectWord-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorUnSelectWord-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorUnindentSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorUnindentSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorUp-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorUp-before.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorUpWithSelection-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorUpWithSelection-before.txt [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/history/core/LocalHistoryTestCase.java
platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeLexerTest.groovy
platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretStateRestoreTest.java [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretTest.java [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretUndoRedoTest.java [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/EditorMultiCaretActionTest.java [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/AbstractEditorTest.java
platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
platform/platform-tests/testSrc/com/intellij/util/graph/ChunkGraphTest.java
platform/platform-tests/testSrc/com/intellij/util/graph/KShortestPathsFinderTest.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java
platform/remote-servers/api/src/com/intellij/remoteServer/runtime/log/LoggingHandler.java
platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/log/LoggingHandlerImpl.java
platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConnectionTask.java
platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentRuntime.java
platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudNotifier.java [new file with mode: 0644]
platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudRuntimeTask.java [new file with mode: 0644]
platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudSupportConfigurableBase.java
platform/remote-servers/impl/src/com/intellij/remoteServer/util/ssh/PublicSshKeyDialog.java [new file with mode: 0644]
platform/remote-servers/impl/src/com/intellij/remoteServer/util/ssh/PublicSshKeyFilePanel.form [new file with mode: 0644]
platform/remote-servers/impl/src/com/intellij/remoteServer/util/ssh/PublicSshKeyFilePanel.java [new file with mode: 0644]
platform/remote-servers/impl/src/com/intellij/remoteServer/util/ssh/PublicSshKeyPanel.java [moved from platform/util-rt/src/java/lang/SafeVarargs.java with 59% similarity]
platform/remote-servers/impl/src/com/intellij/remoteServer/util/ssh/PublicSshKeyTextPanel.form [new file with mode: 0644]
platform/remote-servers/impl/src/com/intellij/remoteServer/util/ssh/PublicSshKeyTextPanel.java [new file with mode: 0644]
platform/remote-servers/impl/src/com/intellij/remoteServer/util/ssh/SshKeyAwareServerRuntime.java [new file with mode: 0644]
platform/remote-servers/impl/src/com/intellij/remoteServer/util/ssh/SshKeyChecker.java [new file with mode: 0644]
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerConsoleView.java
platform/testFramework/src/com/intellij/testFramework/EditorTestUtil.java
platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java
platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java
platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
platform/testFramework/src/com/intellij/testFramework/fixtures/EditorMouseFixture.java [new file with mode: 0644]
platform/testFramework/src/com/intellij/testFramework/fixtures/EditorScrollingFixture.java [new file with mode: 0644]
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
platform/testRunner/src/com/intellij/execution/testframework/ui/BaseTestsOutputConsoleView.java
platform/usageView/src/com/intellij/usages/FindUsagesProcessPresentation.java
platform/usageView/src/com/intellij/usages/UsageLimitUtil.java
platform/usageView/src/com/intellij/usages/impl/PreviewUsageAction.java
platform/usageView/src/com/intellij/usages/impl/UsageContextPanelBase.java
platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java
platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
platform/usageView/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java
platform/usageView/src/com/intellij/usages/impl/rules/UsageType.java
platform/usageView/src/com/intellij/usages/impl/rules/UsageTypeGroupingRule.java
platform/util-rt/src/com/intellij/openapi/util/Conditions.java
platform/util-rt/src/com/intellij/util/NullableConsumer.java
platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java
platform/util-rt/src/com/intellij/util/containers/Stack.java
platform/util/src/com/intellij/openapi/util/MultiValuesMap.java
platform/util/src/com/intellij/util/ArrayConsumer.java
platform/util/src/com/intellij/util/LineSeparator.java
platform/util/src/com/intellij/util/containers/ConcurrentList.java [moved from java/openapi/src/com/intellij/pom/java/events/PomJavaAspectChangeSet.java with 51% similarity]
platform/util/src/com/intellij/util/containers/ContainerUtil.java
platform/util/src/com/intellij/util/containers/LockFreeCopyOnWriteArrayList.java
platform/util/src/com/intellij/util/containers/OpenTHashSet.java
platform/util/src/com/intellij/util/containers/OrderedSet.java
platform/util/src/com/intellij/util/containers/SequenceIterator.java
platform/util/src/com/intellij/util/io/EnumeratorStringDescriptor.java
platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java
platform/vcs-api/src/com/intellij/openapi/vcs/ConcurrentTasks.java
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateActionGroup.java
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogBranchFilter.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogDateFilter.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogDetailsFilter.java [moved from platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogDetailsFilter.java with 67% similarity]
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogFilterCollection.java [new file with mode: 0644]
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogGraphFilter.java [moved from platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogGraphFilter.java with 64% similarity]
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogHashFilter.java [new file with mode: 0644]
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogProvider.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogStructureFilter.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogTextFilter.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogUserFilter.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogBranchFilterImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogDataHolder.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogDateFilterImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFilterer.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogStructureFilterImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogFilterCollectionImpl.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUI.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/DateFilterPopupComponent.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/FilterPopupComponent.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/UserFilterPopupComponent.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogFilterUi.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogTextFilterImpl.java
platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSession.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointPanelProvider.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointManager.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestMethodWithoutAssertionInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/MethodCanBeVariableArityMethodInspection.java
plugins/InspectionGadgets/src/inspectionDescriptions/TestMethodWithoutAssertion.html
plugins/InspectionGadgets/test/com/siyeh/igtest/migration/method_can_be_variable_arity_method/MethodCanBeVariableArity.java
plugins/InspectionGadgets/test/com/siyeh/igtest/migration/method_can_be_variable_arity_method/expected.xml
plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/MethodCanBeVariableArityMethodInspectionTest.java
plugins/IntelliLang/src/META-INF/plugin.xml
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/modifiers/ModifierPredicate.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceIfWithSwitchIntention.java
plugins/IntentionPowerPak/test/com/siyeh/ipp/modifiers/make_public/Method.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/modifiers/make_public/Method_after.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/modifiers/make_public/MyClass.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/modifiers/make_public/MyEnum.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/modifiers/make_public/MyInterface.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/parentheses/ComparisonParentheses.java
plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/modifiers/MakePrivateIntentionTest.java [new file with mode: 0644]
plugins/devkit/src/references/IconsReferencesContributor.java
plugins/devkit/testSources/codeInsight/PluginXmlFunctionalTest.groovy
plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/EclipseCodeStyleSchemeImporter.java
plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/EclipseImportMap.properties
plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/EclipseXmlProfileElements.java
plugins/eclipse/testData/import/settings/eclipse_exported.xml
plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseSettingsImportTest.java
plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentChecker.java
plugins/git4idea/src/git4idea/log/GitLogProvider.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleModuleBuilder.java
plugins/gradle/tooling-extension-v1.11/src/org/jetbrains/plugins/gradle/tooling/v1_11/builder/ModelDependenciesBuilderImpl.java
plugins/gradle/tooling-extension-v1.11/src/org/jetbrains/plugins/gradle/tooling/v1_11/internal/InternalDependencyVersionId.java [new file with mode: 0644]
plugins/gradle/tooling-extension-v1.11/src/org/jetbrains/plugins/gradle/tooling/v1_11/internal/ModelDependenciesBuilderImplHelper.java
plugins/gradle/tooling-extension-v1.12/src/org/jetbrains/plugins/gradle/tooling/v1_12/builder/ModelDependenciesBuilderImpl.java
plugins/gradle/tooling-extension-v1.12/src/org/jetbrains/plugins/gradle/tooling/v1_12/internal/DependencyVersionId.java [deleted file]
plugins/gradle/tooling-extension-v1.12/src/org/jetbrains/plugins/gradle/tooling/v1_12/internal/InternalDependencyVersionId.java [new file with mode: 0644]
plugins/gradle/tooling-extension-v1.12/src/org/jetbrains/plugins/gradle/tooling/v1_12/internal/ModelDependenciesBuilderImplHelper.java
plugins/gradle/tooling-extension-v1.9/src/org/jetbrains/plugins/gradle/tooling/v1_9/builder/ModelDependenciesBuilderImpl.java
plugins/gradle/tooling-extension-v1.9/src/org/jetbrains/plugins/gradle/tooling/v1_9/internal/DependencyVersionId.java [deleted file]
plugins/gradle/tooling-extension-v1.9/src/org/jetbrains/plugins/gradle/tooling/v1_9/internal/InternalDependencyVersionId.java [new file with mode: 0644]
plugins/gradle/tooling-extension-v1.9/src/org/jetbrains/plugins/gradle/tooling/v1_9/internal/ModelDependenciesBuilderImplHelper.java
plugins/gradle/tooling-extension/src/org/jetbrains/plugins/gradle/tooling/internal/DependencyVersionId.java [moved from plugins/gradle/tooling-extension-v1.11/src/org/jetbrains/plugins/gradle/tooling/v1_11/internal/DependencyVersionId.java with 82% similarity]
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrMethodCallInfo.java
plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellActionBase.java
plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlockGenerator.java
plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/GroovyElementType.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/GroovyLexer.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/GroovyElementTypes.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrReferenceListImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/patterns/GroovyMethodCallPattern.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrReferenceListElementType.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/SubstitutorComputer.java
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcProjectWithoutLibraryNotificator.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceHandlerBase.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrInplaceFieldIntroducer.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldProcessor.java
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyDebuggerTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
plugins/groovy/testdata/groovy/actions/moveStatement/moveIntoEmptyLine.test
plugins/groovy/testdata/groovy/actions/moveStatement/moveIntoEmptyLine2.test
plugins/groovy/testdata/groovy/completion/GroovyDocParameter.groovy
plugins/groovy/testdata/highlighting/CircularInheritance.groovy
plugins/groovy/testdata/highlighting/ConstructorWithAllParametersOptional.groovy
plugins/groovy/testdata/highlighting/CyclicInheritance.groovy
plugins/groovy/testdata/parsing/groovy/annotations/ann1.test
plugins/groovy/testdata/parsing/groovy/annotations/ann2.test
plugins/groovy/testdata/parsing/groovy/annotations/ann3.test
plugins/groovy/testdata/parsing/groovy/annotations/ann4.test
plugins/groovy/testdata/parsing/groovy/annotations/ann7.test
plugins/groovy/testdata/parsing/groovy/annotations/classLiteral.test
plugins/groovy/testdata/parsing/groovy/comments/error1205.test
plugins/groovy/testdata/parsing/groovy/expressions/closures/param6.test
plugins/groovy/testdata/parsing/groovy/expressions/closures/param7.test
plugins/groovy/testdata/parsing/groovy/expressions/path/method/method13.test
plugins/groovy/testdata/parsing/groovy/expressions/path/typeVsExpr.test
plugins/groovy/testdata/parsing/groovy/expressions/super/qualifiedSuper.test
plugins/groovy/testdata/parsing/groovy/expressions/super/super.test
plugins/groovy/testdata/parsing/groovy/expressions/this/qualifiedThis.test
plugins/groovy/testdata/parsing/groovy/expressions/this/this.test
plugins/groovy/testdata/parsing/groovy/generics/err1.test
plugins/groovy/testdata/parsing/groovy/generics/err2.test
plugins/groovy/testdata/parsing/groovy/generics/err3.test
plugins/groovy/testdata/parsing/groovy/generics/err4.test
plugins/groovy/testdata/parsing/groovy/generics/genmethod1.test
plugins/groovy/testdata/parsing/groovy/generics/genmethod2.test
plugins/groovy/testdata/parsing/groovy/generics/genmethod3.test
plugins/groovy/testdata/parsing/groovy/generics/genmethod4.test
plugins/groovy/testdata/parsing/groovy/generics/genmethod5.test
plugins/groovy/testdata/parsing/groovy/generics/typeargs1.test
plugins/groovy/testdata/parsing/groovy/generics/typeparam1.test
plugins/groovy/testdata/parsing/groovy/generics/typeparam2.test
plugins/groovy/testdata/parsing/groovy/generics/typeparam3.test
plugins/groovy/testdata/parsing/groovy/statements/branch/ret1.test
plugins/groovy/testdata/parsing/groovy/statements/class_initializers/class_init1.test
plugins/groovy/testdata/parsing/groovy/statements/class_initializers/stat_block.test
plugins/groovy/testdata/parsing/groovy/statements/declaration/GRVY-1451.test
plugins/groovy/testdata/parsing/groovy/statements/declaration/decl11.test
plugins/groovy/testdata/parsing/groovy/statements/declaration/nl_trows.test
plugins/groovy/testdata/parsing/groovy/statements/ifRecovery.test
plugins/groovy/testdata/parsing/groovy/statements/methods/method3.test
plugins/groovy/testdata/parsing/groovy/statements/methods/method4.test
plugins/groovy/testdata/parsing/groovy/statements/semicolonsOnDifferentLines.test
plugins/groovy/testdata/parsing/groovy/statements/top_methods/method3.test
plugins/groovy/testdata/parsing/groovy/statements/top_methods/method4.test
plugins/groovy/testdata/parsing/groovy/statements/try_catch/try5.test
plugins/groovy/testdata/parsing/groovy/statements/tuples/tupleInClass.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/classes/abstr.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/classes/class1.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/classes/class2.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/classes/class3.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/classes/class4.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/classes/class5.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/classes/class6.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/classes/class7.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/classes/errors/classerr1.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/classes/errors/classerr2.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/classes/errors/classerr3.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/construct12.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor1.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor11.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor13.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor14.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor15.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor2.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor3.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor4.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor5.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor6.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor7.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor8.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/constructors/constructor9.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum1.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum3.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum4.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum5.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum6.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum7.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/errors/interfaceerr1.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/errors/interfaceerr2.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/errors/interfaceerr3.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/interface1.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/interface2.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/interface3.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/interface4.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/interface5.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/member3.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/members/member1.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/members/member2.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/members/member3.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/members/member4.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/members/member5.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/members/member6.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/interfaces/members/memeber7.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/methods/method2.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/methods/method3.test
plugins/groovy/testdata/parsing/groovy/statements/typedef/methods/method4.test
plugins/groovy/testdata/parsing/groovy/statements/unnamedField.test
plugins/groovy/testdata/parsing/groovy/types/ann_def1.test
plugins/groovy/testdata/parsing/groovy/types/ann_def2.test
plugins/groovy/testdata/parsing/groovy/types/default1.test
plugins/groovy/testdata/parsing/groovy/types/default2.test
plugins/groovy/testdata/parsing/groovy/types/incorrectParam1.test
plugins/groovy/testdata/parsing/groovy/types/incorrectParam3.test
plugins/groovy/testdata/parsing/groovy/types/incorrectParameter2.test
plugins/groovy/testdata/parsing/groovy/types/interfaceWithGroovyDoc.test
plugins/groovy/testdata/parsing/groovy/types/newlineBeforeExtends.test
plugins/groovy/testdata/parsing/groovy/types/staticInitializer.test
plugins/groovy/testdata/parsing/groovy/types/type1.test
plugins/groovy/testdata/parsing/groovy/types/type10.test
plugins/groovy/testdata/parsing/groovy/types/type11.test
plugins/groovy/testdata/parsing/groovy/types/type13.test
plugins/groovy/testdata/parsing/groovy/types/type5.test
plugins/groovy/testdata/parsing/groovy/types/type6.test
plugins/groovy/testdata/parsing/groovy/types/type7.test
plugins/groovy/testdata/parsing/groovy/types/type8.test
plugins/groovy/testdata/parsing/groovy/types/type9.test
plugins/groovy/testdata/reparse/MultilineToNormalString.txt
plugins/groovy/testdata/reparse/NoVariableName.txt
plugins/groovy/testdata/reparse/OpeningParenthesisAtBlockStart.txt
plugins/groovy/testdata/reparse/SwitchCaseDef.txt
plugins/groovy/testdata/reparse/SwitchCaseDo.txt
plugins/groovy/testdata/reparse/SwitchCaseDot.txt
plugins/groovy/testdata/reparse/SwitchCaseFor.txt
plugins/groovy/testdata/reparse/SwitchCaseIf.txt
plugins/groovy/testdata/reparse/SwitchCaseSwitch.txt
plugins/groovy/testdata/reparse/SwitchCaseWhile.txt
plugins/groovy/testdata/reparse/SwitchRParen.txt
plugins/groovy/testdata/reparse/SynchronizedRParen.txt
plugins/groovy/testdata/reparse/WhileRParen.txt
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryFiles.java
plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryImpl.java
plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryReader.java
plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java
plugins/hg4idea/testSrc/hg4idea/test/repo/HgRealRepositoryReaderTest.java
plugins/hg4idea/testSrc/hg4idea/test/repo/HgRepositoryReaderTest.java
plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml
plugins/maven/artifact-resolver-m31/maven-artifact-resolver-m31.iml
plugins/maven/maven3-server-impl/lib-src/apache-maven-3.0.3-src.zip [deleted file]
plugins/maven/maven3-server-impl/lib-src/maven-dependency-tree-1.2-sources.jar [deleted file]
plugins/maven/maven3-server-impl/lib-src/nexus-indexer-3.0.4-sources.jar [deleted file]
plugins/maven/maven3-server-impl/lib-src/wagon-1.0-beta-7-source-release.zip [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/bin/m2.conf
plugins/maven/maven3-server-impl/lib/maven3/lib/aether-api-1.11.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/aether-api-1.13.1.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/aether-connector-wagon-1.11.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/aether-connector-wagon-1.13.1.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/aether-impl-1.11.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/aether-impl-1.13.1.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/aether-spi-1.11.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/aether-spi-1.13.1.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/aether-util-1.11.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/aether-util-1.13.1.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-aether-provider-3.0.3.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-aether-provider-3.0.5.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-artifact-3.0.3.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-artifact-3.0.5.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-compat-3.0.5.jar [moved from plugins/maven/maven3-server-impl/lib/maven3/lib/maven-compat-3.0.3.jar with 64% similarity]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-core-3.0.5.jar [moved from plugins/maven/maven3-server-impl/lib/maven3/lib/maven-core-3.0.3.jar with 64% similarity]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-embedder-3.0.3.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-embedder-3.0.5.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-3.0.5.jar [moved from plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-3.0.3.jar with 74% similarity]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-builder-3.0.5.jar [moved from plugins/maven/maven3-server-impl/lib/maven3/lib/maven-model-builder-3.0.3.jar with 52% similarity]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-plugin-api-3.0.5.jar [moved from plugins/maven/maven3-server-impl/lib/maven3/lib/maven-plugin-api-3.0.3.jar with 82% similarity]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-repository-metadata-3.0.5.jar [moved from plugins/maven/maven3-server-impl/lib/maven3/lib/maven-repository-metadata-3.0.3.jar with 85% similarity]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-3.0.5.jar [moved from plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-3.0.3.jar with 79% similarity]
plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-builder-3.0.5.jar [moved from plugins/maven/maven3-server-impl/lib/maven3/lib/maven-settings-builder-3.0.3.jar with 62% similarity]
plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-cipher-1.4.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/plexus-cipher-1.7.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/sisu-guava-0.9.9.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/sisu-guice-2.9.4-no_aop.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/sisu-guice-3.1.0-no_aop.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/sisu-inject-bean-2.1.1.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/sisu-inject-bean-2.3.0.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/sisu-inject-plexus-2.1.1.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/sisu-inject-plexus-2.3.0.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-file-1.0-beta-7.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-file-2.4.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http-2.4-shaded.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http-lightweight-1.0-beta-7.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-http-shared-1.0-beta-7.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-provider-api-1.0-beta-7.jar [deleted file]
plugins/maven/maven3-server-impl/lib/maven3/lib/wagon-provider-api-2.4.jar [new file with mode: 0644]
plugins/maven/maven3-server-impl/maven3-server-impl.iml
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java
plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomMaven3ModelInterpolator2.java [new file with mode: 0644]
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcher.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenArchetypesStep.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java
plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java
plugins/properties/src/com/intellij/lang/properties/psi/impl/PropertyImplEscaper.java
plugins/tasks/tasks-core/src/com/intellij/tasks/generic/GenericRepositoryUtil.java
plugins/ui-designer/src/messages/UIDesignerBundle.properties
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/FindByXPathAction.java
python/build/python_plugin_build.gant
python/helpers/pydev/pydev_monkey.py
python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
python/ide/src/com/jetbrains/python/PyIdeCommonOptionsForm.java
python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java
python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form
python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java
python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.form [deleted file]
python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
python/ide/src/com/jetbrains/python/configuration/PyActiveSdkModuleConfigurable.java
python/ide/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java
python/ide/src/com/jetbrains/python/configuration/PyConfigureInterpretersLinkPanel.java
python/ide/src/com/jetbrains/python/configuration/PythonSdkConfigurable.form [deleted file]
python/ide/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java [moved from python/ide/src/com/jetbrains/python/configuration/PythonSdkConfigurable.java with 52% similarity]
python/ide/src/com/jetbrains/python/configuration/VirtualEnvProjectFilter.java
python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java
python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectDialog.java
python/pluginResources/META-INF/plugin.xml
python/psi-api/src/com/jetbrains/python/psi/PyArgumentList.java
python/psi-api/src/com/jetbrains/python/psi/PyCallExpression.java
python/psi-api/src/com/jetbrains/python/psi/PyClass.java
python/psi-api/src/com/jetbrains/python/psi/PyElementGenerator.java
python/resources/icon-robots.txt
python/resources/icons/com/jetbrains/python/interpreterGear.png [new file with mode: 0644]
python/resources/icons/com/jetbrains/python/interpreterGear@2x.png [new file with mode: 0644]
python/resources/icons/com/jetbrains/python/interpreterGear@2x_dark.png [new file with mode: 0644]
python/resources/icons/com/jetbrains/python/interpreterGear_dark.png [new file with mode: 0644]
python/resources/icons/com/jetbrains/python/skeleton.png [new file with mode: 0644]
python/resources/icons/com/jetbrains/python/skeleton@2x.png [new file with mode: 0644]
python/src/META-INF/pycharm-core.xml
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java
python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java
python/src/com/jetbrains/python/console/PythonConsoleView.java
python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java
python/src/com/jetbrains/python/debugger/PyDebugRunner.java
python/src/com/jetbrains/python/editor/PythonEnterHandler.java
python/src/com/jetbrains/python/inspections/quickfix/AddMethodQuickFix.java
python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
python/src/com/jetbrains/python/psi/PyUtil.java
python/src/com/jetbrains/python/psi/impl/PyArgumentListImpl.java
python/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java
python/src/com/jetbrains/python/psi/impl/PyElementGeneratorImpl.java
python/src/com/jetbrains/python/psi/impl/PyFileImpl.java
python/src/com/jetbrains/python/psi/impl/PyFunctionBuilder.java
python/src/com/jetbrains/python/refactoring/classes/PyClassMembersRefactoringSupport.java
python/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringUtil.java
python/src/com/jetbrains/python/refactoring/classes/PyMemberInfoStorage.java
python/src/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassHelper.java
python/src/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassInfoModel.java
python/src/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassInitializationInfo.java
python/src/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassPresenterImpl.java
python/src/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassViewSwingImpl.java
python/src/com/jetbrains/python/refactoring/classes/membersManager/FieldsManager.java
python/src/com/jetbrains/python/refactoring/classes/membersManager/InstanceFieldsManager.java
python/src/com/jetbrains/python/refactoring/classes/membersManager/MembersManager.java
python/src/com/jetbrains/python/refactoring/classes/membersManager/MethodsManager.java
python/src/com/jetbrains/python/refactoring/classes/membersManager/PyMemberInfo.java
python/src/com/jetbrains/python/refactoring/classes/membersManager/PyMembersRefactoringBaseProcessor.java
python/src/com/jetbrains/python/refactoring/classes/membersManager/SuperClassesManager.java
python/src/com/jetbrains/python/refactoring/classes/membersManager/TypeSafeMovingStrategy.java [new file with mode: 0644]
python/src/com/jetbrains/python/refactoring/classes/membersManager/vp/MembersBasedView.java
python/src/com/jetbrains/python/refactoring/classes/membersManager/vp/MembersBasedViewSwingImpl.java
python/src/com/jetbrains/python/refactoring/classes/membersManager/vp/MembersViewInitializationInfo.java
python/src/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpConflictsUtil.java
python/src/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpPresenterImpl.java
python/src/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpProcessor.java
python/src/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpViewInitializationInfo.java
python/src/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpViewSwingImpl.java
python/src/com/jetbrains/python/refactoring/classes/pushDown/PyPushDownConflicts.java
python/src/com/jetbrains/python/refactoring/classes/pushDown/PyPushDownPresenterImpl.java
python/src/com/jetbrains/python/refactoring/classes/pushDown/PyPushDownProcessor.java
python/src/com/jetbrains/python/refactoring/classes/pushDown/PyPushDownViewSwingImpl.java
python/src/com/jetbrains/python/refactoring/classes/ui/PyMemberSelectionPanel.java
python/src/com/jetbrains/python/refactoring/classes/ui/PyMemberSelectionTable.java
python/src/com/jetbrains/python/refactoring/extractmethod/PyExtractMethodUtil.java
python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.form
python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.java
python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java
python/src/com/jetbrains/python/sdk/PyDetectedSdk.java [new file with mode: 0644]
python/src/com/jetbrains/python/sdk/PySdkListCellRenderer.java
python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java [moved from python/src/com/jetbrains/python/sdk/InterpreterPathChooser.java with 50% similarity]
python/src/com/jetbrains/python/sdk/PythonSdkType.java
python/src/com/jetbrains/python/sdk/flavors/MacPythonSdkFlavor.java
python/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java
python/src/com/jetbrains/python/sdk/flavors/UnixPythonSdkFlavor.java
python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java
python/src/icons/PythonIcons.java
python/testData/inspections/PyUnresolvedReferencesInspection/slotsAsExternal.py [deleted file]
python/testData/refactoring/argumentList/addKeyArgument/addArgumentFile.after.py [new file with mode: 0644]
python/testData/refactoring/argumentList/addKeyArgument/addArgumentFile.py [new file with mode: 0644]
python/testData/refactoring/argumentList/addKeyArgument/stub.py [new file with mode: 0644]
python/testData/refactoring/argumentList/addParam/addArgumentFile.after.py [new file with mode: 0644]
python/testData/refactoring/argumentList/addParam/addArgumentFile.py [new file with mode: 0644]
python/testData/refactoring/argumentList/addParam/stub.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstract/abc.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstract/dest_module.after.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstract/dest_module.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstract/shared_module.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstract/source_module.after.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstract/source_module.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstractImportExistsPy3/abc.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstractImportExistsPy3/dest_module.after.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstractImportExistsPy3/dest_module.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstractImportExistsPy3/shared_module.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstractImportExistsPy3/source_module.after.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/moveAndMakeAbstractImportExistsPy3/source_module.py [new file with mode: 0644]
python/testData/refactoring/extractsuperclass/presenter/file.py
python/testData/refactoring/pullup/abstractMethodHasMeta/Class.after.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodHasMeta/Class.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodHasMeta/SuperClass.after.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodHasMeta/SuperClass.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodHasMeta/abc.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodPy2AddMeta/Class.after.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodPy2AddMeta/Class.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodPy2AddMeta/SuperClass.after.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodPy2AddMeta/SuperClass.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodPy2AddMeta/abc.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodPy3AddMeta/Class.after.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodPy3AddMeta/Class.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodPy3AddMeta/SuperClass.after.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodPy3AddMeta/SuperClass.py [new file with mode: 0644]
python/testData/refactoring/pullup/abstractMethodPy3AddMeta/abc.py [new file with mode: 0644]
python/testData/refactoring/pullup/presenter/file.py
python/testSrc/com/jetbrains/python/PyRequirementTest.java
python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
python/testSrc/com/jetbrains/python/psi/impl/PyArgumentListImplTest.java [new file with mode: 0644]
python/testSrc/com/jetbrains/python/refactoring/PyCodeFragmentTest.java
python/testSrc/com/jetbrains/python/refactoring/classes/NameAndStatusTransformer.java
python/testSrc/com/jetbrains/python/refactoring/classes/PyClassRefactoringTest.java
python/testSrc/com/jetbrains/python/refactoring/classes/PyPresenterTestMemberEntry.java
python/testSrc/com/jetbrains/python/refactoring/classes/PyRefactoringPresenterTestCase.java
python/testSrc/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassPresenterTest.java
python/testSrc/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassTest.java
python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpPresenterTest.java
python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpTest.java
python/testSrc/com/jetbrains/python/refactoring/classes/pushDown/PyPushDownTest.java
resources/src/META-INF/IdeaPlugin.xml
updater/src/com/intellij/updater/DeleteAction.java
updater/src/com/intellij/updater/Patch.java
updater/src/com/intellij/updater/Runner.java
updater/testSrc/com/intellij/updater/DigesterTest.java
updater/testSrc/com/intellij/updater/RunnerTest.java
updater/testSrc/com/intellij/updater/UpdaterTestCase.java
updater/updater.iml
xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java
xml/dom-impl/src/com/intellij/util/xml/ModelMergerImpl.java
xml/dom-openapi/src/com/intellij/util/xml/ModelMerger.java
xml/dom-openapi/src/com/intellij/util/xml/ModelMergerUtil.java
xml/dom-openapi/src/com/intellij/util/xml/highlighting/BasicDomElementsInspection.java
xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsInspection.java
xml/dom-tests/tests/com/intellij/util/xml/DomIncludesTest.java
xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubTest.java
xml/impl/src/com/intellij/ide/browsers/WebBrowserManager.java

index 66a2888dd6a4a280821fdf8226fef3c43385ed42..5b9240f121af4df46fe8c9ad6ff750eaf462292c 100644 (file)
@@ -209,13 +209,13 @@ libraryLicense(name: "Log4j", libraryName: "Log4J", version: "1.2.17", license:
 libraryLicense(name: "markdownj", libraryName: "markdownj", version: "0.4.2", license: "New BSD", url: "https://code.google.com/p/markdownj/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
 libraryLicense(name: "Maven", version: "2.2.1", license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
 libraryLicense(name: "plexus-util", version: "2.0.6", license: "Apache 2.0", url: "http://maven.apache.org/", libraryNames:['plexus-utils-2.0.6.jar'], licenseUrl: "http://apache.org/licenses/LICENSE-2.0")
-libraryLicense(name: "aether-api", version: "1.11", libraryNames: ["aether-api-1.11.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
+libraryLicense(name: "aether-api", version: "1.13.1", libraryNames: ["aether-api-1.13.1.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
 libraryLicense(name: "aether-api-0.9.0.M2.jar", version: "0.9.0.M2", libraryNames: ["aether-api-0.9.0.M2.jar"], license: "Eclipse Public License v1.0", url: "http://nexus.sonatype.org/", licenseUrl: "http://www.eclipse.org/org/documents/epl-v10.html")
 libraryLicense(name: "maven-2.2.1-uber", version: "2.2.1", libraryNames: ["maven-2.2.1-uber.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
-libraryLicense(name: "maven-artifact", version: "3.0.3", libraryNames: ["maven-artifact-3.0.3.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
-libraryLicense(name: "maven-core", version: "3.0.3", libraryNames: ["maven-core-3.0.3.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
+libraryLicense(name: "maven-artifact", version: "3.0.5", libraryNames: ["maven-artifact-3.0.5.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
+libraryLicense(name: "maven-core", version: "3.0.5", libraryNames: ["maven-core-3.0.5.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
 libraryLicense(name: "plexus-component-annotations", version: "1.5.5", libraryNames: ["plexus-component-annotations-1.5.5.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
-libraryLicense(name: "Maven3", libraryNames: ["Maven3", "maven-dependency-tree-1.2.jar", "archetype-catalog-2.2.jar", "archetype-common-2.2.jar"], version: "3.0.3", license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
+libraryLicense(name: "Maven3", libraryNames: ["Maven3", "maven-dependency-tree-1.2.jar", "archetype-catalog-2.2.jar", "archetype-common-2.2.jar"], version: "3.0.5", license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
 libraryLicense(name: "Gradle", version: "1.9", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
 libraryLicense(name: "GradleJnaPosix", version: "1.0.3", license: "LGPL 2.1", url: "http://www.jruby.org/", licenseUrl: "http://www.gnu.org/licenses/lgpl-2.1.txt")
 libraryLicense(name: "Slf4j", version: "1.7.2", license: "MIT License", url: "http://slf4j.org/", licenseUrl: "http://slf4j.org/license.html")
index 88aa8966e163acaba0afabc01f574250840d8e82..120b85c9bfc28fdc21111e69f77c909242cf2463 100644 (file)
@@ -25,9 +25,6 @@
   </application-components>
 
   <actions>
-    <action id="images.color.picker" class="org.intellij.images.actions.ColorPickerForImageAction" text="Show Color Picker">
-      <add-to-group anchor="after" group-id="ProjectViewPopupMenu" relative-to-action="EditSource"/>
-    </action>
     <action class="org.intellij.images.actions.EditExternallyAction"
             id="Images.EditExternally"
             icon="ImagesIcons.EditExternally"
@@ -88,7 +85,7 @@
       <separator/>
       <reference id="VersionControlsGroup"/>
       <separator/>
-      <reference id="images.color.picker" />
+      <reference id="ShowColorPicker" />
       <reference id="Images.EditExternally"/>
       <reference id="ExternalToolsGroup"/>
     </group>
index 139f487936ba9f26fa17893a2f9be418fdeaa883..52f77b199f047f63096a1e0ce80952f54bb10442 100644 (file)
@@ -33,16 +33,16 @@ public enum ClassFilesIndexFeature {
   @NotNull
   private final String myKey;
   @NotNull
-  private final Collection<? extends MethodsUsageIndexConfigure> myRequiredIndicesConfigures;
+  private final Collection<? extends ClassFilesIndexConfigure> myRequiredIndicesConfigures;
 
   ClassFilesIndexFeature(@NotNull final String key,
-                         @NotNull final Collection<? extends MethodsUsageIndexConfigure> requiredIndicesConfigures) {
+                         @NotNull final Collection<? extends ClassFilesIndexConfigure> requiredIndicesConfigures) {
     myKey = key;
     myRequiredIndicesConfigures = requiredIndicesConfigures;
   }
 
-  ClassFilesIndexFeature(@NotNull final String key, @NotNull final MethodsUsageIndexConfigure requiredConfigure) {
-    this(key, Collections.<MethodsUsageIndexConfigure>singleton(requiredConfigure));
+  ClassFilesIndexFeature(@NotNull final String key, @NotNull final ClassFilesIndexConfigure requiredConfigure) {
+    this(key, Collections.<ClassFilesIndexConfigure>singleton(requiredConfigure));
   }
 
   public RegistryValue getRegistryValue() {
@@ -70,7 +70,7 @@ public enum ClassFilesIndexFeature {
   }
 
   @NotNull
-  public Collection<? extends MethodsUsageIndexConfigure> getRequiredIndicesConfigures() {
+  public Collection<? extends ClassFilesIndexConfigure> getRequiredIndicesConfigures() {
     return myRequiredIndicesConfigures;
   }
 }
index 1b17eaaf1423f7585ef6271119046becd595e34d..eee027c2c1e9ce97079e1d3b66135b6620d89822 100644 (file)
@@ -86,7 +86,7 @@ public class ClassFilesIndexFeaturesHolder extends AbstractProjectComponent {
     }
     for (final ClassFilesIndexFeature feature : ClassFilesIndexFeature.values()) {
       if (feature.isEnabled() && !myEnabledFeatures.containsKey(feature)) {
-        for (final MethodsUsageIndexConfigure configure : feature.getRequiredIndicesConfigures()) {
+        for (final ClassFilesIndexConfigure configure : feature.getRequiredIndicesConfigures()) {
           if (!myEnabledIndexReaders.containsKey(configure)) {
             notAvailableConfiguresVisitor.process(configure);
           }
@@ -96,7 +96,7 @@ public class ClassFilesIndexFeaturesHolder extends AbstractProjectComponent {
   }
 
   private synchronized void disposeFeature(final ClassFilesIndexFeature featureToRemove) {
-    for (final MethodsUsageIndexConfigure requiredConfigure : featureToRemove.getRequiredIndicesConfigures()) {
+    for (final ClassFilesIndexConfigure requiredConfigure : featureToRemove.getRequiredIndicesConfigures()) {
       boolean needClose = true;
       for (final ClassFilesIndexFeature enabledFeature : myEnabledFeatures.keySet()) {
         if (!enabledFeature.equals(featureToRemove) && enabledFeature.getRequiredIndicesConfigures().contains(requiredConfigure)) {
@@ -116,10 +116,10 @@ public class ClassFilesIndexFeaturesHolder extends AbstractProjectComponent {
     if (myEnabledFeatures.containsKey(feature)) {
       throw new IllegalStateException(String.format("feature %s already contains", feature.getKey()));
     }
-    final Map<MethodsUsageIndexConfigure, ClassFilesIndexReaderBase> newIndices =
-      new HashMap<MethodsUsageIndexConfigure, ClassFilesIndexReaderBase>();
+    final Map<ClassFilesIndexConfigure, ClassFilesIndexReaderBase> newIndices =
+      new HashMap<ClassFilesIndexConfigure, ClassFilesIndexReaderBase>();
     FeatureState newFeatureState = FeatureState.AVAILABLE;
-    for (final MethodsUsageIndexConfigure requiredConfigure : feature.getRequiredIndicesConfigures()) {
+    for (final ClassFilesIndexConfigure requiredConfigure : feature.getRequiredIndicesConfigures()) {
       boolean isIndexAlreadyLoaded = false;
       for (final ClassFilesIndexFeature enabledFeature : myEnabledFeatures.keySet()) {
         if (enabledFeature.getRequiredIndicesConfigures().contains(requiredConfigure)) {
index 0cb2dd4d839cd488ea9dd68fe758c3f192adb910..8f6a7ebc7eb6143c1d6d1e26376c8d1d1832add5 100644 (file)
@@ -55,9 +55,6 @@ public abstract class ClassFilesIndexReaderBase<K, V> {
     }
   }
 
-  /**
-   * All inheritors MUST have constructor with only one parameter - Project
-   */
   @SuppressWarnings("ConstantConditions")
   protected ClassFilesIndexReaderBase(final KeyDescriptor<K> keyDescriptor,
                                       final DataExternalizer<V> valueExternalizer,
@@ -149,5 +146,4 @@ public abstract class ClassFilesIndexReaderBase<K, V> {
       return true;
     }
   }
-
 }
index ac6df7346449ebc08d98cab06365515648ea2540..da119b1049652ddeb312047811b48d03286e80b5 100644 (file)
@@ -52,7 +52,7 @@ public class CachedRelevantStaticMethodSearcher {
                                                                     final ChainCompletionContext completionContext) {
     if (resultQualifiedClassName == null ||
         ChainCompletionStringUtil.isPrimitiveOrArrayOfPrimitives(resultQualifiedClassName) ||
-        completionContext.getTargetQName().equals(resultQualifiedClassName)) {
+        completionContext.getTarget().equals(resultQualifiedClassName)) {
       return Collections.emptyList();
     }
     final TreeSet<UsageIndexValue> indexValues = myIndexReader.getMethods(resultQualifiedClassName);
@@ -68,7 +68,7 @@ public class CachedRelevantStaticMethodSearcher {
         else {
           final PsiMethod[] methods = completionContext.resolveNotDeprecated(methodInvocation);
           method = MethodChainsSearchUtil
-            .getMethodWithMinNotPrimitiveParameters(methods, Collections.singleton(completionContext.getTargetQName()));
+            .getMethodWithMinNotPrimitiveParameters(methods, Collections.singleton(completionContext.getTarget().getClassQName()));
           myCachedResolveResults.put(methodInvocation, method);
           if (method == null) {
             return Collections.emptyList();
index 339428525e7ef1373847e9acbc0b6a8b2db0ee05..c040e96e1217448887ede6efdd198f22e08e2e1d 100644 (file)
 package com.intellij.compiler.classFilesIndex.chainsSearch;
 
 import com.intellij.compiler.classFilesIndex.chainsSearch.context.ChainCompletionContext;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.TargetType;
 import com.intellij.compiler.classFilesIndex.impl.MethodsUsageIndexReader;
 import com.intellij.compiler.classFilesIndex.impl.UsageIndexValue;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.util.Pair;
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.PsiMethod;
-import com.intellij.psi.PsiModifier;
+import com.intellij.psi.*;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.classFilesIndex.indexer.impl.MethodIncompleteSignature;
+import org.jetbrains.jps.incremental.storage.BuildDataManager;
 
 import java.util.*;
 
@@ -42,21 +42,36 @@ public final class ChainsSearcher {
   private static final Logger LOG = Logger.getInstance(ChainsSearcher.class);
   private static final double NEXT_METHOD_IN_CHAIN_RATIO = 1.5;
 
-  public static List<MethodsChain> search(final MethodsUsageIndexReader indexReader,
-                                          final String targetQName,
+  public static List<MethodsChain> search(final int pathMaximalLength,
+                                          final TargetType targetType,
                                           final Set<String> contextQNames,
                                           final int maxResultSize,
-                                          final int pathMaximalLength,
-                                          final ChainCompletionContext context) {
-    final SearchInitializer initializer = createInitializer(targetQName, indexReader, context.getExcludedQNames(), context);
-    return search(indexReader, initializer, contextQNames, pathMaximalLength, maxResultSize, targetQName, context);
+                                          final ChainCompletionContext context,
+                                          final MethodsUsageIndexReader methodsUsageIndexReader) {
+    final SearchInitializer initializer =
+      createInitializer(targetType,
+                        context.getExcludedQNames(),
+                        methodsUsageIndexReader,
+                        context);
+    if (initializer == null) {
+      return Collections.emptyList();
+    }
+    return search(methodsUsageIndexReader,
+                  initializer,
+                  contextQNames,
+                  pathMaximalLength,
+                  maxResultSize,
+                  targetType.getClassQName(),
+                  context);
   }
 
-  private static SearchInitializer createInitializer(final String targetQName,
-                                                     final MethodsUsageIndexReader indexReader,
+  @Nullable
+  private static SearchInitializer createInitializer(final TargetType target,
                                                      final Set<String> excludedParamsTypesQNames,
+                                                     final MethodsUsageIndexReader methodsUsageIndexReader,
                                                      final ChainCompletionContext context) {
-    return new SearchInitializer(indexReader.getMethods(targetQName), targetQName, excludedParamsTypesQNames, context);
+    final TreeSet<UsageIndexValue> methods = methodsUsageIndexReader.getMethods(target.getClassQName());
+    return new SearchInitializer(methods, target.getClassQName(), excludedParamsTypesQNames, context);
   }
 
   @NotNull
@@ -80,22 +95,20 @@ public final class ChainsSearcher {
                                                                                                      @Override
                                                                                                      public WeightAware<Pair<MethodIncompleteSignature, MethodsChain>> fun(
                                                                                                        final WeightAware<MethodIncompleteSignature> methodIncompleteSignatureWeightAware) {
-                                                                                                       final MethodIncompleteSignature
-                                                                                                         underlying =
-                                                                                                         methodIncompleteSignatureWeightAware
-                                                                                                           .getUnderlying();
+                                                                                                       final MethodIncompleteSignature underlying = methodIncompleteSignatureWeightAware.getUnderlying();
                                                                                                        return new WeightAware<Pair<MethodIncompleteSignature, MethodsChain>>(
                                                                                                          new Pair<MethodIncompleteSignature, MethodsChain>(
-                                                                                                           underlying, new MethodsChain(
-                                                                                                           context.resolveNotDeprecated(
-                                                                                                             underlying),
-                                                                                                           methodIncompleteSignatureWeightAware
-                                                                                                             .getWeight(),
-                                                                                                           underlying.getOwner())),
-                                                                                                         methodIncompleteSignatureWeightAware
-                                                                                                           .getWeight());
+                                                                                                           underlying,
+                                                                                                           new MethodsChain(context.resolveNotDeprecated(underlying),
+                                                                                                                            methodIncompleteSignatureWeightAware.getWeight(),
+                                                                                                                            underlying.getOwner()
+                                                                                                           )
+                                                                                                         ),
+                                                                                                         methodIncompleteSignatureWeightAware.getWeight()
+                                                                                                       );
                                                                                                      }
-                                                                                                   }));
+                                                                                                   }
+      ));
 
     int maxWeight = 0;
     for (final MethodsChain methodsChain : knownDistance.values()) {
@@ -118,7 +131,8 @@ public final class ChainsSearcher {
         result.add(currentVertex.getUnderlying().getSecond());
         continue;
       }
-      final SortedSet<UsageIndexValue> nextMethods = indexReader.getMethods(currentVertexUnderlying.getFirst().getOwner());
+      final String currentReturnType = currentVertexUnderlying.getFirst().getOwner();
+      final SortedSet<UsageIndexValue> nextMethods = indexReader.getMethods(currentReturnType);
       final MaxSizeTreeSet<WeightAware<MethodIncompleteSignature>> currentSignatures =
         new MaxSizeTreeSet<WeightAware<MethodIncompleteSignature>>(maxResultSize);
       for (final UsageIndexValue indexValue : nextMethods) {
@@ -133,8 +147,10 @@ public final class ChainsSearcher {
                 final MethodIncompleteSignature methodInvocation = indexValue.getMethodIncompleteSignature();
                 final PsiMethod[] psiMethods = context.resolveNotDeprecated(methodInvocation);
                 if (psiMethods.length != 0 && MethodChainsSearchUtil.checkParametersForTypesQNames(psiMethods, allExcludedNames)) {
-                  final MethodsChain newBestMethodsChain = currentVertexMethodsChain.addEdge(psiMethods, indexValue.getMethodIncompleteSignature().getOwner(), vertexDistance);
-                  currentSignatures.add(new WeightAware<MethodIncompleteSignature>(indexValue.getMethodIncompleteSignature(), vertexDistance));
+                  final MethodsChain newBestMethodsChain =
+                    currentVertexMethodsChain.addEdge(psiMethods, indexValue.getMethodIncompleteSignature().getOwner(), vertexDistance);
+                  currentSignatures
+                    .add(new WeightAware<MethodIncompleteSignature>(indexValue.getMethodIncompleteSignature(), vertexDistance));
                   knownDistance.put(vertex, newBestMethodsChain);
                 }
               }
@@ -302,4 +318,4 @@ public final class ChainsSearcher {
       return resultHolder.getRawResult();
     }
   }
-}
+}
\ No newline at end of file
index 0ff5ab710ef5cec01eb509fa58929161ebb1dec0..08dbe04040eff87f79624596c7afb2bf80ddf592 100644 (file)
@@ -83,7 +83,6 @@ public final class MethodChainsSearchUtil {
     return false;
   }
 
-  @SafeVarargs
   public static <T> HashSet<T> unionToHashSet(final Collection<T> collection, final T... items) {
     final HashSet<T> result = new HashSet<T>();
     result.addAll(collection);
index ab0ea0e452cf0e802efdc2d423773b0f01f1f7bf..7d46c07759efe3253f4465755732a850f5b60a97 100644 (file)
@@ -156,7 +156,6 @@ public class MethodsChain {
     return false;
   }
 
-  @SafeVarargs
   private static Set<String> joinSets(final Set<String>... sets) {
     final Set<String> result = new HashSet<String>();
     for (final Set<String> set : sets) {
index 46724834d765d26c3ba3e8f67499700d8ee701c0..00a0dcd725970696691a55655cb3ea73477df432 100644 (file)
@@ -60,8 +60,7 @@ public class MethodsChainLookupRangingHelper {
 
   @SuppressWarnings("ConstantConditions")
   @Nullable
-  private static WeightableChainLookupElement chainToWeightableLookupElement(final MethodsChain chain,
-                                                                             final ChainCompletionContext context) {
+  private static LookupElement chainToWeightableLookupElement(final MethodsChain chain, final ChainCompletionContext context) {
     final int chainSize = chain.size();
     assert chainSize != 0;
     final int lastMethodWeight = chain.getChainWeight();
@@ -76,7 +75,7 @@ public class MethodsChainLookupRangingHelper {
 
     for (final PsiMethod[] psiMethods : chain.getPath()) {
       final PsiMethod method =
-        MethodChainsSearchUtil.getMethodWithMinNotPrimitiveParameters(psiMethods, Collections.singleton(context.getTargetQName()));
+        MethodChainsSearchUtil.getMethodWithMinNotPrimitiveParameters(psiMethods, Collections.singleton(context.getTarget().getClassQName()));
       if (method == null) {
         return null;
       }
@@ -141,52 +140,49 @@ public class MethodsChainLookupRangingHelper {
     for (int i = 0; i < parameters.length; i++) {
       final PsiParameter parameter = parameters[i];
       final String typeQName = parameter.getType().getCanonicalText();
-      if (typeQName != null) {
-        if (JAVA_LANG_STRING.equals(typeQName)) {
-          final PsiVariable relevantStringVar = context.findRelevantStringInContext(parameter.getName());
-          if (relevantStringVar == null) {
-            notMatchedStringVars++;
-          }
-          else {
-            parametersMap.put(i, new VariableSubLookupElement(relevantStringVar));
-          }
+      if (JAVA_LANG_STRING.equals(typeQName)) {
+        final PsiVariable relevantStringVar = context.findRelevantStringInContext(parameter.getName());
+        if (relevantStringVar == null) {
+          notMatchedStringVars++;
         }
-        else if (!ChainCompletionStringUtil.isPrimitiveOrArrayOfPrimitives(typeQName)) {
-          final Collection<PsiVariable> contextVariables = context.getVariables(typeQName);
-          final PsiVariable contextVariable = ContainerUtil.getFirstItem(contextVariables, null);
-          if (contextVariable != null) {
-            if (contextVariables.size() == 1) parametersMap.put(i, new VariableSubLookupElement(contextVariable));
-            matchedParametersInContext++;
-            continue;
-          }
-          final Collection<ContextRelevantVariableGetter> relevantVariablesGetters = context.getRelevantVariablesGetters(typeQName);
-          final ContextRelevantVariableGetter contextVariableGetter = ContainerUtil.getFirstItem(relevantVariablesGetters, null);
-          if (contextVariableGetter != null) {
-            if (relevantVariablesGetters.size() == 1) parametersMap.put(i, contextVariableGetter.createSubLookupElement());
-            matchedParametersInContext++;
-            continue;
-          }
-          final Collection<PsiMethod> containingClassMethods = context.getContainingClassMethods(typeQName);
-          final PsiMethod contextRelevantGetter = ContainerUtil.getFirstItem(containingClassMethods, null);
-          if (contextRelevantGetter != null) {
-            if (containingClassMethods.size() == 1) parametersMap.put(i, new GetterLookupSubLookupElement(method.getName()));
-            matchedParametersInContext++;
-            continue;
-          }
-          //todo
-          final ContextRelevantStaticMethod contextRelevantStaticMethod =
-            ContainerUtil.getFirstItem(context.getRelevantStaticMethods(typeQName, weight), null);
-          if (contextRelevantStaticMethod != null) {
-            //
-            // In most cases it is not really relevant
-            //
-            //parametersMap.put(i, contextRelevantStaticMethod.createLookupElement());
-            matchedParametersInContext++;
-            continue;
-          }
-          if (!nullableNotNullManager.isNullable(parameter, true)) {
-            unreachableParametersCount++;
-          }
+        else {
+          parametersMap.put(i, new VariableSubLookupElement(relevantStringVar));
+        }
+      }
+      else if (!ChainCompletionStringUtil.isPrimitiveOrArrayOfPrimitives(typeQName)) {
+        final Collection<PsiVariable> contextVariables = context.getVariables(typeQName);
+        final PsiVariable contextVariable = ContainerUtil.getFirstItem(contextVariables, null);
+        if (contextVariable != null) {
+          if (contextVariables.size() == 1) parametersMap.put(i, new VariableSubLookupElement(contextVariable));
+          matchedParametersInContext++;
+          continue;
+        }
+        final Collection<ContextRelevantVariableGetter> relevantVariablesGetters = context.getRelevantVariablesGetters(typeQName);
+        final ContextRelevantVariableGetter contextVariableGetter = ContainerUtil.getFirstItem(relevantVariablesGetters, null);
+        if (contextVariableGetter != null) {
+          if (relevantVariablesGetters.size() == 1) parametersMap.put(i, contextVariableGetter.createSubLookupElement());
+          matchedParametersInContext++;
+          continue;
+        }
+        final Collection<PsiMethod> containingClassMethods = context.getContainingClassMethods(typeQName);
+        final PsiMethod contextRelevantGetter = ContainerUtil.getFirstItem(containingClassMethods, null);
+        if (contextRelevantGetter != null) {
+          if (containingClassMethods.size() == 1) parametersMap.put(i, new GetterLookupSubLookupElement(method.getName()));
+          matchedParametersInContext++;
+          continue;
+        }
+        final ContextRelevantStaticMethod contextRelevantStaticMethod =
+          ContainerUtil.getFirstItem(context.getRelevantStaticMethods(typeQName, weight), null);
+        if (contextRelevantStaticMethod != null) {
+          //
+          // In most cases it is not really relevant
+          //
+          //parametersMap.put(i, contextRelevantStaticMethod.createLookupElement());
+          matchedParametersInContext++;
+          continue;
+        }
+        if (!nullableNotNullManager.isNullable(parameter, true)) {
+          unreachableParametersCount++;
         }
       }
     }
index 3cdc760c5ff351d019f5f82a111734e0f3dcaaff..68c252907b8e3118a0f37bc43054bdcfb798157d 100644 (file)
@@ -59,7 +59,7 @@ public final class ParametersMatcher {
       else {
         unMatched++;
       }
-      if (context.getTargetQName().equals(canonicalText) || additionalExcludedNames.contains(canonicalText)) {
+      if (context.getTarget().getClassQName().equals(canonicalText) || additionalExcludedNames.contains(canonicalText)) {
         hasTarget = true;
       }
     }
index 609f560749e3b753b9a5afc1f6468962bbc3fecf..85ee710c8df49685a18d82e3e22991bae36575e5 100644 (file)
@@ -1,41 +1,23 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.intellij.compiler.classFilesIndex.chainsSearch.completion;
 
 import com.intellij.codeInsight.completion.*;
+import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexFeature;
 import com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexFeaturesHolder;
-import com.intellij.compiler.classFilesIndex.chainsSearch.ChainCompletionStringUtil;
-import com.intellij.compiler.classFilesIndex.chainsSearch.ChainsSearcher;
-import com.intellij.compiler.classFilesIndex.chainsSearch.MethodsChain;
-import com.intellij.compiler.classFilesIndex.chainsSearch.MethodsChainLookupRangingHelper;
+import com.intellij.compiler.classFilesIndex.chainsSearch.*;
 import com.intellij.compiler.classFilesIndex.chainsSearch.context.ChainCompletionContext;
 import com.intellij.compiler.classFilesIndex.chainsSearch.context.ContextUtil;
-import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.compiler.classFilesIndex.chainsSearch.context.TargetType;
 import com.intellij.compiler.classFilesIndex.impl.MethodsUsageIndexReader;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.module.ModuleUtilCore;
+import com.intellij.openapi.project.Project;
 import com.intellij.patterns.ElementPattern;
 import com.intellij.psi.*;
-import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.impl.source.PsiImmediateClassType;
 import com.intellij.psi.search.searches.DirectClassInheritorsSearch;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.ProcessingContext;
-import com.intellij.util.Processor;
-import com.intellij.util.SmartList;
+import com.intellij.util.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -47,7 +29,10 @@ import static com.intellij.patterns.PsiJavaPatterns.or;
  * @author Dmitry Batkovich
  */
 public class MethodsChainsCompletionContributor extends CompletionContributor {
-  public static final int INVOCATIONS_THRESHOLD = 3;
+  private final static boolean IS_UNIT_TEST_MODE = ApplicationManager.getApplication().isUnitTestMode();
+
+  public static final int INVOCATIONS_THRESHOLD = 2;
+  public static final CompletionType COMPLETION_TYPE = IS_UNIT_TEST_MODE ? CompletionType.BASIC : CompletionType.SMART;
 
   private final static int MAX_SEARCH_RESULT_SIZE = 5;
   private final static int MAX_CHAIN_SIZE = 4;
@@ -55,13 +40,10 @@ public class MethodsChainsCompletionContributor extends CompletionContributor {
 
   @Override
   public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet result) {
-    if (parameters.getInvocationCount() >= INVOCATIONS_THRESHOLD
-        && ClassFilesIndexFeaturesHolder.getInstance(parameters.getPosition().getProject())
+    if (parameters.getInvocationCount() >= INVOCATIONS_THRESHOLD &&
+        ClassFilesIndexFeaturesHolder.getInstance(parameters.getPosition().getProject())
           .enableFeatureIfNeed(ClassFilesIndexFeature.METHOD_CHAINS_COMPLETION)) {
       super.fillCompletionVariants(parameters, result);
-      if (ApplicationManager.getApplication().isUnitTestMode()) {
-        result.stopHere();
-      }
     }
   }
 
@@ -69,7 +51,7 @@ public class MethodsChainsCompletionContributor extends CompletionContributor {
   public MethodsChainsCompletionContributor() {
     final ElementPattern<PsiElement> pattern =
       or(CompletionContributorPatternUtil.patternForMethodParameter(), CompletionContributorPatternUtil.patternForVariableAssignment());
-    extend(CompletionType.BASIC, pattern, new CompletionProvider<CompletionParameters>() {
+    extend(COMPLETION_TYPE, pattern, new CompletionProvider<CompletionParameters>() {
       @Override
       protected void addCompletions(final @NotNull CompletionParameters parameters,
                                     final ProcessingContext context,
@@ -77,7 +59,6 @@ public class MethodsChainsCompletionContributor extends CompletionContributor {
         final ChainCompletionContext completionContext = extractContext(parameters);
         if (completionContext == null) return;
 
-        final String targetClassQName = completionContext.getTargetQName();
         final Set<String> contextTypesKeysSet = completionContext.getContextTypes();
         final Set<String> contextRelevantTypes = new HashSet<String>(contextTypesKeysSet.size() + 1);
         for (final String type : contextTypesKeysSet) {
@@ -85,48 +66,73 @@ public class MethodsChainsCompletionContributor extends CompletionContributor {
             contextRelevantTypes.add(type);
           }
         }
-        contextRelevantTypes.remove(targetClassQName);
-
-        final List<LookupElement> foundElements = searchForLookups(targetClassQName, contextRelevantTypes, completionContext);
-        result.addAllElements(foundElements);
+        final TargetType target = completionContext.getTarget();
+        contextRelevantTypes.remove(target.getClassQName());
+        final List<LookupElement> elementsFoundByMethodsChainsSearch = searchForLookups(target, contextRelevantTypes, completionContext);
+        if (!IS_UNIT_TEST_MODE) {
+          result.runRemainingContributors(parameters, new Consumer<CompletionResult>() {
+            @Override
+            public void consume(final CompletionResult completionResult) {
+              final LookupElement lookupElement = completionResult.getLookupElement();
+              final PsiElement lookupElementPsi = lookupElement.getPsiElement();
+              if (lookupElementPsi != null) {
+                for (final LookupElement element : elementsFoundByMethodsChainsSearch) {
+                  if (lookupElementPsi.isEquivalentTo(element.getPsiElement())) {
+                    elementsFoundByMethodsChainsSearch.remove(element);
+                    break;
+                  }
+                }
+              }
+              result.passResult(completionResult);
+            }
+          });
+        } else {
+          result.stopHere();
+        }
+        result.addAllElements(elementsFoundByMethodsChainsSearch);
       }
     });
   }
 
-  private static List<LookupElement> searchForLookups(final String targetClassQName,
+  private static List<LookupElement> searchForLookups(final TargetType target,
                                                       final Set<String> contextRelevantTypes,
                                                       final ChainCompletionContext completionContext) {
-    final MethodsUsageIndexReader methodsUsageIndexReader = MethodsUsageIndexReader.getInstance(completionContext.getProject());
+    final Project project = completionContext.getProject();
+    final MethodsUsageIndexReader methodsUsageIndexReader = MethodsUsageIndexReader.getInstance(project);
     final List<MethodsChain> searchResult =
-      searchChains(targetClassQName, contextRelevantTypes, MAX_SEARCH_RESULT_SIZE, MAX_CHAIN_SIZE, completionContext, methodsUsageIndexReader);
+      searchChains(target, contextRelevantTypes, MAX_SEARCH_RESULT_SIZE, MAX_CHAIN_SIZE, completionContext, methodsUsageIndexReader);
     if (searchResult.size() < MAX_SEARCH_RESULT_SIZE) {
-      final PsiClass aClass = JavaPsiFacade.getInstance(completionContext.getProject())
-        .findClass(targetClassQName, GlobalSearchScope.allScope(completionContext.getProject()));
-      if (aClass != null) {
-        DirectClassInheritorsSearch.search(aClass).forEach(new Processor<PsiClass>() {
+      if (!target.isArray()) {
+        final List<MethodsChain> inheritorFilteredSearchResult = new SmartList<MethodsChain>();
+        final Processor<TargetType> consumer = new Processor<TargetType>() {
           @Override
-          public boolean process(final PsiClass psiClass) {
-            final String inheritorQName = psiClass.getQualifiedName();
-            if (!StringUtil.isEmpty(inheritorQName)) {
-              final List<MethodsChain> inheritorFilteredSearchResult = new SmartList<MethodsChain>();
-              //noinspection ConstantConditions
-              for (final MethodsChain chain : searchChains(inheritorQName, contextRelevantTypes, MAX_SEARCH_RESULT_SIZE, MAX_CHAIN_SIZE,
-                                                           completionContext, methodsUsageIndexReader)) {
-                boolean insert = true;
-                for (final MethodsChain baseChain : searchResult) {
-                  final MethodsChain.CompareResult r = MethodsChain.compare(baseChain, chain, completionContext.getPsiManager());
-                  if (r != MethodsChain.CompareResult.NOT_EQUAL) {
-                    insert = false;
-                    break;
-                  }
-                }
-                if (insert) {
-                  inheritorFilteredSearchResult.add(chain);
+          public boolean process(final TargetType targetType) {
+            for (final MethodsChain chain : searchChains(targetType, contextRelevantTypes, MAX_SEARCH_RESULT_SIZE, MAX_CHAIN_SIZE,
+                                                         completionContext, methodsUsageIndexReader)) {
+              boolean insert = true;
+              for (final MethodsChain baseChain : searchResult) {
+                final MethodsChain.CompareResult r = MethodsChain.compare(baseChain, chain, completionContext.getPsiManager());
+                if (r != MethodsChain.CompareResult.NOT_EQUAL) {
+                  insert = false;
+                  break;
                 }
               }
-              searchResult.addAll(inheritorFilteredSearchResult);
+              if (insert) {
+                inheritorFilteredSearchResult.add(chain);
+              }
+            }
+            searchResult.addAll(inheritorFilteredSearchResult);
+            return searchResult.size() < MAX_SEARCH_RESULT_SIZE;
+          }
+        };
+        DirectClassInheritorsSearch.search(((PsiClassType)target.getPsiType()).resolve()).forEach(new Processor<PsiClass>() {
+          @Override
+          public boolean process(final PsiClass psiClass) {
+            final String inheritorQName = psiClass.getQualifiedName();
+            if (inheritorQName == null) {
+              return true;
             }
-            return true;
+            return consumer.process(new TargetType(inheritorQName, false, new PsiImmediateClassType(psiClass, PsiSubstitutor.EMPTY)));
           }
         });
       }
@@ -206,12 +212,12 @@ public class MethodsChainsCompletionContributor extends CompletionContributor {
     return filteredResult;
   }
 
-  private static List<MethodsChain> searchChains(final String targetQName,
+  private static List<MethodsChain> searchChains(final TargetType target,
                                                  final Set<String> contextVarsQNames,
                                                  final int maxResultSize,
                                                  final int maxChainSize,
                                                  final ChainCompletionContext context,
                                                  final MethodsUsageIndexReader methodsUsageIndexReader) {
-    return ChainsSearcher.search(methodsUsageIndexReader, targetQName, contextVarsQNames, maxResultSize, maxChainSize, context);
+    return ChainsSearcher.search(maxChainSize, target, contextVarsQNames, maxResultSize, context, methodsUsageIndexReader);
   }
-}
+}
\ No newline at end of file
index b74e2044712bebd22bd1d9a1c45854235504e975..7d25398e549d9a9c48e975468185689e17a668af 100644 (file)
@@ -19,10 +19,7 @@ import com.intellij.compiler.classFilesIndex.chainsSearch.CachedRelevantStaticMe
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.NotNullLazyValue;
 import com.intellij.openapi.util.UserDataHolder;
-import com.intellij.psi.JavaPsiFacade;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.PsiMethod;
-import com.intellij.psi.PsiVariable;
+import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.containers.FactoryMap;
 import com.intellij.util.containers.MultiMap;
@@ -44,7 +41,7 @@ public class ChainCompletionContext {
     }
   };
   private final PsiMethod myContextMethod;
-  private final String myTargetQName;
+  private final TargetType myTarget;
   private final Set<String> myContainingClassQNames;
   private final MultiMap<String, PsiVariable> myContextVars;
   private final MultiMap<String, PsiMethod> myContainingClassGetters;
@@ -72,7 +69,7 @@ public class ChainCompletionContext {
   }
 
   ChainCompletionContext(final PsiMethod contextMethod,
-                         final String targetQName,
+                         final TargetType target,
                          final Set<String> containingClassQNames,
                          final MultiMap<String, PsiVariable> contextVars,
                          final MultiMap<String, PsiMethod> containingClassGetters,
@@