Merge fixes of some exceptions made for 121.
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sat, 11 Aug 2012 11:20:24 +0000 (15:20 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Sat, 11 Aug 2012 11:20:24 +0000 (15:20 +0400)
887 files changed:
bin/win/IdeaWin32.dll
bin/win/IdeaWin64.dll
build.txt
build/lib/gant/jps-sources.zip
build/lib/gant/lib/jps-programRunner.jar
build/lib/gant/lib/jps.jar
build/scripts/layouts.gant
build/scripts/libLicenses.gant
java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java
java/debugger/impl/src/com/intellij/debugger/ui/JavaDebuggerSupport.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointChooser.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/UpdatableDebuggerView.java
java/execution/impl/src/com/intellij/execution/actions/AbstractRerunFailedTestsAction.java
java/java-impl/src/com/intellij/application/options/JavaArrangementPanel.java [new file with mode: 0644]
java/java-impl/src/com/intellij/application/options/JavaCodeStyleMainPanel.java
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
java/java-impl/src/com/intellij/codeInsight/TailTypes.java
java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java
java/java-impl/src/com/intellij/codeInsight/completion/Java15CompletionData.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaGlobalMemberLookupElement.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaPsiClassReferenceElement.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaStaticMemberProcessor.java
java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java
java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java
java/java-impl/src/com/intellij/codeInsight/completion/simple/BracesTailType.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/RefCountHolder.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReuseVariableDeclarationFix.java
java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java
java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandlerImpl.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/BindFieldsFromParametersAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/DeannotateIntentionAction.java
java/java-impl/src/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java
java/java-impl/src/com/intellij/codeInsight/template/JavaCodeContextType.java
java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java
java/java-impl/src/com/intellij/ide/structureView/impl/java/JavaInheritedMembersNodeProvider.java
java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultClassNavigationContributor.java
java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java
java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java
java/java-impl/src/com/intellij/psi/filters/getters/JavaMembersGetter.java
java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java
java/java-impl/src/com/intellij/psi/impl/source/PsiExpressionCodeFragmentImpl.java
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
java/java-impl/src/com/intellij/psi/util/proximity/JavaInheritanceWeigher.java
java/java-impl/src/com/intellij/psi/util/proximity/SamePsiMemberWeigher.java
java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java
java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveJavaMemberHandler.java
java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java
java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java
java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java
java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java
java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java
java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java
java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaStaticMemberNameIndex.java [new file with mode: 0644]
java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaStaticMemberTypeIndex.java [new file with mode: 0644]
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaOverridingMethodsSearcher.java
java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java
java/java-psi-api/src/com/intellij/codeInsight/ExternalAnnotationsManager.java
java/java-psi-api/src/com/intellij/psi/PsiExpressionCodeFragment.java
java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
java/java-psi-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionHints.java
java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/cache/TypeInfo.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaFieldStubElementType.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaMethodElementType.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementType.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/index/JavaStubIndexKeys.java
java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ProcessCandidateParameterTypeInferencePolicy.java
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java
java/java-tests/testData/codeInsight/completion/keywords/classInMethod.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/completion/keywords/spaceAfterInstanceof.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/completion/keywords/spaceAfterInstanceof_after.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/completion/normal/StaticallyImportedInner.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/completion/smartType/second/GlobalFactoryMethods.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/completion/smartType/second/NoLeftRecursion.java
java/java-tests/testData/codeInsight/completion/smartType/second/NoUnqualifiedCastsInQualifiedContext.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA89771.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA89801.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/EffectiveFinal.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/bindFieldsFromParameters/afterAlreadyExistingFields.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/bindFieldsFromParameters/beforeAlreadyExistingFields.java [new file with mode: 0644]
java/java-tests/testData/inspection/redundantCast/generics/CastToUnboundWildcard/expected.xml [new file with mode: 0644]
java/java-tests/testData/inspection/redundantCast/generics/CastToUnboundWildcard/src/Test.java [new file with mode: 0644]
java/java-tests/testData/libResolve/inheritance/fullLibrary.jar [new file with mode: 0644]
java/java-tests/testData/libResolve/inheritance/middleBottom.jar [new file with mode: 0644]
java/java-tests/testData/refactoring/moveMembers/multipleWithDependencies/after/A.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveMembers/multipleWithDependencies/after/B.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveMembers/multipleWithDependencies/before/A.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveMembers/multipleWithDependencies/before/B.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
java/java-tests/testSrc/com/intellij/codeInsight/completion/KeywordCompletionTest.java
java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java
java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.groovy
java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInspection/RedundantCast15Test.java
java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java
java/java-tests/testSrc/com/intellij/psi/PsiDocumentManagerImplTest.java
java/java-tests/testSrc/com/intellij/psi/resolve/ResolveInLibrariesTest.groovy
java/java-tests/testSrc/com/intellij/refactoring/MoveMembersTest.java
java/java-tests/testSrc/com/intellij/roots/ManagingContentRootFoldersTest.java
java/java-tests/testSrc/com/intellij/roots/ManagingContentRootsTest.java
java/java-tests/testSrc/com/intellij/roots/OrderEnumeratorTest.java
java/testFramework/src/com/intellij/codeInsight/completion/LightCompletionTestCase.java
jps/jps-builders/proto/cmdline_remote_proto.proto
jps/jps-builders/src/org/jetbrains/jps/api/CmdlineRemoteProto.java
jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
jps/jps-builders/src/org/jetbrains/jps/cmdline/ProjectDescriptor.java
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
jps/jps-builders/testSrc/org/jetbrains/jps/builders/JpsBuildTestCase.java
jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTestCase.java
jps/model-api/src/org/jetbrains/jps/model/DummyJpsElementProperties.java [deleted file]
jps/model-api/src/org/jetbrains/jps/model/JpsDummyElement.java [moved from jps/model-api/src/org/jetbrains/jps/model/JpsElementProperties.java with 52% similarity]
jps/model-api/src/org/jetbrains/jps/model/JpsElementFactory.java
jps/model-api/src/org/jetbrains/jps/model/JpsElementType.java
jps/model-api/src/org/jetbrains/jps/model/JpsElementTypeWithDefaultProperties.java
jps/model-api/src/org/jetbrains/jps/model/JpsGlobal.java
jps/model-api/src/org/jetbrains/jps/model/JpsProject.java
jps/model-api/src/org/jetbrains/jps/model/JpsSimpleElement.java [new file with mode: 0644]
jps/model-api/src/org/jetbrains/jps/model/JpsTypedData.java [deleted file]
jps/model-api/src/org/jetbrains/jps/model/JpsTypedElement.java [moved from jps/model-api/src/org/jetbrains/jps/model/SimpleJpsElement.java with 50% similarity]
jps/model-api/src/org/jetbrains/jps/model/artifact/DirectoryArtifactType.java
jps/model-api/src/org/jetbrains/jps/model/artifact/JarArtifactType.java
jps/model-api/src/org/jetbrains/jps/model/artifact/JpsArtifact.java
jps/model-api/src/org/jetbrains/jps/model/artifact/JpsArtifactService.java
jps/model-api/src/org/jetbrains/jps/model/artifact/JpsArtifactType.java
jps/model-api/src/org/jetbrains/jps/model/java/JavaSourceRootProperties.java
jps/model-api/src/org/jetbrains/jps/model/java/JavaSourceRootType.java
jps/model-api/src/org/jetbrains/jps/model/java/JpsJavaLibraryType.java
jps/model-api/src/org/jetbrains/jps/model/java/JpsJavaModuleType.java
jps/model-api/src/org/jetbrains/jps/model/java/JpsJavaSdkType.java
jps/model-api/src/org/jetbrains/jps/model/java/JpsJavaSdkTypeWrapper.java
jps/model-api/src/org/jetbrains/jps/model/library/JpsLibrary.java
jps/model-api/src/org/jetbrains/jps/model/library/JpsLibraryCollection.java
jps/model-api/src/org/jetbrains/jps/model/library/JpsLibraryType.java
jps/model-api/src/org/jetbrains/jps/model/library/JpsSdkProperties.java [deleted file]
jps/model-api/src/org/jetbrains/jps/model/library/JpsSdkType.java [deleted file]
jps/model-api/src/org/jetbrains/jps/model/library/JpsTypedLibrary.java
jps/model-api/src/org/jetbrains/jps/model/library/JpsTypedLibraryReference.java [deleted file]
jps/model-api/src/org/jetbrains/jps/model/library/sdk/JpsSdk.java [new file with mode: 0644]
jps/model-api/src/org/jetbrains/jps/model/library/sdk/JpsSdkReference.java [new file with mode: 0644]
jps/model-api/src/org/jetbrains/jps/model/library/sdk/JpsSdkType.java [new file with mode: 0644]
jps/model-api/src/org/jetbrains/jps/model/module/JpsDependenciesList.java
jps/model-api/src/org/jetbrains/jps/model/module/JpsFacet.java
jps/model-api/src/org/jetbrains/jps/model/module/JpsFacetType.java
jps/model-api/src/org/jetbrains/jps/model/module/JpsModule.java
jps/model-api/src/org/jetbrains/jps/model/module/JpsModuleSourceRoot.java
jps/model-api/src/org/jetbrains/jps/model/module/JpsModuleSourceRootType.java
jps/model-api/src/org/jetbrains/jps/model/module/JpsModuleType.java
jps/model-api/src/org/jetbrains/jps/model/module/JpsSdkDependency.java
jps/model-api/src/org/jetbrains/jps/model/module/JpsSdkReferencesTable.java
jps/model-api/src/org/jetbrains/jps/model/module/JpsTypedModule.java [new file with mode: 0644]
jps/model-impl/src/org/jetbrains/jps/model/artifact/impl/JpsArtifactImpl.java
jps/model-impl/src/org/jetbrains/jps/model/artifact/impl/JpsArtifactReferenceImpl.java
jps/model-impl/src/org/jetbrains/jps/model/artifact/impl/JpsArtifactServiceImpl.java
jps/model-impl/src/org/jetbrains/jps/model/impl/JpsDummyElementImpl.java [new file with mode: 0644]
jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementCollectionImpl.java
jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementFactoryImpl.java
jps/model-impl/src/org/jetbrains/jps/model/impl/JpsGlobalImpl.java
jps/model-impl/src/org/jetbrains/jps/model/impl/JpsNamedElementReferenceBase.java
jps/model-impl/src/org/jetbrains/jps/model/impl/JpsNamedElementReferenceImpl.java [new file with mode: 0644]
jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectImpl.java
jps/model-impl/src/org/jetbrains/jps/model/impl/JpsSimpleElementImpl.java [new file with mode: 0644]
jps/model-impl/src/org/jetbrains/jps/model/impl/JpsTypedDataImpl.java [deleted file]
jps/model-impl/src/org/jetbrains/jps/model/impl/JpsTypedDataRole.java [deleted file]
jps/model-impl/src/org/jetbrains/jps/model/impl/SimpleJpsElementImpl.java [deleted file]
jps/model-impl/src/org/jetbrains/jps/model/impl/SimpleJpsElementRole.java [deleted file]
jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaExtensionServiceImpl.java
jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryCollectionImpl.java
jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryImpl.java
jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryReferenceImpl.java
jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsSdkReferenceImpl.java
jps/model-impl/src/org/jetbrains/jps/model/library/impl/sdk/JpsSdkImpl.java [new file with mode: 0644]
jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesListImpl.java
jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependencyElementBase.java
jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsFacetImpl.java
jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsFacetReferenceImpl.java
jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleImpl.java
jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleReferenceImpl.java
jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleSourceRootImpl.java
jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsSdkDependencyImpl.java
jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsSdkReferencesTableImpl.java
jps/model-impl/testSrc/org/jetbrains/jps/model/JpsFacetTest.java
jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModuleTest.java
jps/model-serialization/jps-model-serialization.iml
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JDomSerializationUtil.java [new file with mode: 0644]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsElementExtensionSerializerBase.java [new file with mode: 0644]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsElementPropertiesSerializer.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsGlobalExtensionSerializer.java [new file with mode: 0644]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsGlobalLoader.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsLibraryPropertiesSerializer.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsLibraryTableSerializer.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsLoaderBase.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsModelSerializerExtension.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsModuleComponentSerializer.java [deleted file]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsModulePropertiesSerializer.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsModuleSerializer.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectExtensionSerializer.java [new file with mode: 0644]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectLoader.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsSdkPropertiesSerializer.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsSdkTableSerializer.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsArtifactDummyPropertiesSerializer.java [new file with mode: 0644]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsArtifactLoader.java [deleted file]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsArtifactPropertiesSerializer.java [new file with mode: 0644]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsArtifactSerializer.java [new file with mode: 0644]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsPackagingElementLoader.java [deleted file]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/artifact/JpsPackagingElementSerializer.java [new file with mode: 0644]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/facet/FacetState.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/facet/JpsFacetConfigurationSerializer.java [new file with mode: 0644]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/facet/JpsFacetLoader.java [deleted file]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/facet/JpsFacetSerializer.java [new file with mode: 0644]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/facet/JpsModuleExtensionLoader.java [deleted file]
jps/model-serialization/src/org/jetbrains/jps/model/serialization/java/JpsJavaModelSerializerExtension.java
jps/model-serialization/testData/sampleProject/.idea/artifacts/dir.xml [new file with mode: 0644]
jps/model-serialization/testData/sampleProject/.idea/artifacts/jar.xml [new file with mode: 0644]
jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsArtifactSerializationTest.java [new file with mode: 0644]
jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsGlobalSerializationTest.java
jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsProjectSerializationTest.java
jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsSerializationTestCase.java
jps/model/src/org/jetbrains/jps/ProjectPaths.java
native/IdeaWin32/IdeaWin32.cpp
platform/bootstrap/src/com/intellij/idea/Main.java
platform/core-api/src/com/intellij/lang/LanguageExtension.java
platform/core-api/src/com/intellij/openapi/roots/FileIndexFacade.java
platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
platform/core-api/src/com/intellij/openapi/vfs/newvfs/events/VFileContentChangeEvent.java
platform/core-api/src/com/intellij/openapi/vfs/newvfs/events/VFileMoveEvent.java
platform/core-api/src/com/intellij/openapi/vfs/newvfs/events/VFilePropertyChangeEvent.java
platform/core-impl/src/com/intellij/extapi/psi/StubBasedPsiElementBase.java
platform/core-impl/src/com/intellij/mock/MockFileIndexFacade.java
platform/core-impl/src/com/intellij/openapi/editor/ex/util/SegmentArray.java
platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java
platform/core-impl/src/com/intellij/psi/impl/EmptyFileManager.java
platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManager.java
platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
platform/core-impl/src/com/intellij/psi/stubs/StubTreeBuilder.java
platform/core-impl/src/com/intellij/psi/stubs/StubTreeLoader.java
platform/icons/src/general/collapseAllHover_dark.png [new file with mode: 0644]
platform/icons/src/general/collapseAll_dark.png [new file with mode: 0644]
platform/icons/src/general/expandAllHover_dark.png [new file with mode: 0644]
platform/icons/src/general/expandAll_dark.png [new file with mode: 0644]
platform/icons/src/general/gearHover_dark.png [new file with mode: 0644]
platform/icons/src/general/gear_dark.png [new file with mode: 0644]
platform/icons/src/general/hideDownHover_dark.png [new file with mode: 0644]
platform/icons/src/general/hideDownPartHover_dark.png [new file with mode: 0644]
platform/icons/src/general/hideDownPart_dark.png [new file with mode: 0644]
platform/icons/src/general/hideDown_dark.png [new file with mode: 0644]
platform/icons/src/general/hideLeftHover_dark.png [new file with mode: 0644]
platform/icons/src/general/hideLeftPartHover_dark.png [new file with mode: 0644]
platform/icons/src/general/hideLeftPart_dark.png [new file with mode: 0644]
platform/icons/src/general/hideLeft_dark.png [new file with mode: 0644]
platform/icons/src/general/hideRightHover_dark.png [new file with mode: 0644]
platform/icons/src/general/hideRightPartHover_dark.png [new file with mode: 0644]
platform/icons/src/general/hideRightPart_dark.png [new file with mode: 0644]
platform/icons/src/general/hideRight_dark.png [new file with mode: 0644]
platform/icons/src/general/hideToolWindowInactive_dark.png [new file with mode: 0644]
platform/icons/src/general/hideToolWindow_dark.png [new file with mode: 0644]
platform/icons/src/general/locateHover_dark.png [new file with mode: 0644]
platform/icons/src/general/locate_dark.png [new file with mode: 0644]
platform/icons/src/general/splitGlueH_dark.png [new file with mode: 0644]
platform/icons/src/general/splitGlueV_dark.png [new file with mode: 0644]
platform/icons/src/general/tbHidden_dark.png [new file with mode: 0644]
platform/icons/src/general/tbShown_dark.png [new file with mode: 0644]
platform/indexing-api/src/com/intellij/psi/stubs/AbstractStubIndex.java
platform/indexing-api/src/com/intellij/psi/stubs/StubIndexExtension.java
platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/IdentifierParser.java
platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/KeywordParser.java
platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/NumberParser.java
platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java
platform/lang-api/src/com/intellij/codeInsight/TailType.java
platform/lang-api/src/com/intellij/codeInsight/lookup/Lookup.java
platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java
platform/lang-api/src/com/intellij/codeInspection/QuickFix.java
platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java
platform/lang-api/src/com/intellij/diagnostic/logging/LogFilterModel.java
platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
platform/lang-api/src/com/intellij/ide/util/gotoByName/ChooseByNameModel.java
platform/lang-api/src/com/intellij/lang/documentation/DocumentationProvider.java
platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java
platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java
platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/model/ArrangementSettingType.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/model/ArrangementSettingsAtomNode.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/model/ArrangementSettingsCompositeNode.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/model/ArrangementSettingsNode.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/model/ArrangementSettingsNodeVisitor.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/model/HierarchicalArrangementSettingsNode.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/settings/ArrangementSettings.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/settings/ArrangementStandardSettingsAware.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/settings/group/ArrangementSettingsNodeGrouper.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/search/scope/NonProjectFilesScope.java
platform/lang-api/src/com/intellij/psi/search/scope/TestsScope.java
platform/lang-api/src/com/intellij/psi/stubs/Stubbed.java
platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementAndNodeComponent.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementAtomNodeComponent.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementNodeComponent.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementNodeComponentFactory.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementNodeDisplayManager.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementSettingsPanel.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementSettingsUtil.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionData.java
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionPhase.java
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionThreading.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionSorterImpl.java
platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/DefaultGutterIconNavigationHandler.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/AbstractExternalFilter.java
platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPasteIndentProcessor.java
platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/BaseIndentEnterHandler.java
platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/ComparingClassifier.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupArranger.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/EmptyLookupItem.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/EndHandler.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupActionHandler.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupOffsets.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
platform/lang-impl/src/com/intellij/codeInsight/template/macro/CapitalizeAndUnderscoreMacro.java
platform/lang-impl/src/com/intellij/codeInsight/template/macro/CapitalizeMacro.java
platform/lang-impl/src/com/intellij/conversion/DetachFacetConversionProcessor.java
platform/lang-impl/src/com/intellij/conversion/ProjectConverter.java
platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java
platform/lang-impl/src/com/intellij/conversion/impl/ConversionRunner.java
platform/lang-impl/src/com/intellij/conversion/impl/ModuleSettingsImpl.java
platform/lang-impl/src/com/intellij/conversion/impl/SettingsXmlFile.java
platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java
platform/lang-impl/src/com/intellij/execution/actions/RunContextAction.java
platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java
platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
platform/lang-impl/src/com/intellij/facet/impl/FacetUtil.java
platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
platform/lang-impl/src/com/intellij/ide/actions/RelatedItemLineMarkerGotoAdapter.java
platform/lang-impl/src/com/intellij/ide/impl/convert/JDomConvertingUtil.java
platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java
platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java
platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
platform/lang-impl/src/com/intellij/ide/util/InheritedMembersNodeProvider.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/ide/util/NavigationItemListCellRenderer.java
platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameItemProvider.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/SimpleChooseByNameModel.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java
platform/lang-impl/src/com/intellij/injected/editor/EditorWindow.java
platform/lang-impl/src/com/intellij/mock/MockFileManager.java
platform/lang-impl/src/com/intellij/openapi/fileTypes/PlainTextSyntaxHighlighterFactory.java
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModuleElementsEditor.java
platform/lang-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java
platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
platform/lang-impl/src/com/intellij/refactoring/rename/RenameDialog.java
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
platform/lang-impl/src/com/intellij/tools/ExternalToolsCheckinHandlerFactory.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/tools/ToolBeforeRunTaskProvider.java
platform/lang-impl/src/com/intellij/tools/ToolSelectDialog.java
platform/lang-impl/src/com/intellij/tools/ToolsProjectConfig.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/ui/ReplacePromptDialog.java
platform/lang-impl/src/com/intellij/ui/popup/util/DetailController.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/ui/popup/util/DetailViewImpl.java
platform/lang-impl/src/com/intellij/ui/popup/util/ItemWrapperListRenderer.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/ui/popup/util/MasterController.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java
platform/lang-impl/src/com/intellij/ui/tabs/FileColorConfigurationEditDialog.java
platform/lang-impl/src/com/intellij/ui/tabs/FileColorManagerImpl.java
platform/lang-impl/src/com/intellij/util/indexing/IOUtils.java
platform/lvcs-impl/src/com/intellij/history/core/ChangeListStorageImpl.java
platform/platform-api/src/com/intellij/openapi/editor/EditorFactory.java
platform/platform-api/src/com/intellij/openapi/editor/LazyRangeMarkerFactory.java
platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java
platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java
platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
platform/platform-api/src/com/intellij/openapi/ui/Messages.java
platform/platform-api/src/com/intellij/openapi/ui/TextFieldWithBrowseButton.java
platform/platform-api/src/com/intellij/openapi/ui/popup/JBPopupFactory.java
platform/platform-api/src/com/intellij/openapi/ui/popup/ListItemDescriptor.java
platform/platform-api/src/com/intellij/openapi/util/PasswordPromptDialog.java
platform/platform-api/src/com/intellij/openapi/util/PasswordUtil.java
platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java
platform/platform-api/src/com/intellij/openapi/vfs/newvfs/ManagingFS.java
platform/platform-api/src/com/intellij/openapi/wm/AppIconScheme.java
platform/platform-api/src/com/intellij/ui/AddEditRemovePanel.java
platform/platform-api/src/com/intellij/ui/CheckBoxList.java
platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java
platform/platform-api/src/com/intellij/ui/ScreenUtil.java
platform/platform-api/src/com/intellij/ui/ScrollPaneFactory.java
platform/platform-api/src/com/intellij/ui/SeparatorWithText.java
platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java
platform/platform-api/src/com/intellij/ui/border/IdeaTitledBorder.java
platform/platform-api/src/com/intellij/ui/components/JBLoadingPanel.java
platform/platform-api/src/com/intellij/ui/speedSearch/NameFilteringListModel.java
platform/platform-api/src/com/intellij/ui/table/JBTable.java
platform/platform-impl/platform-impl.iml
platform/platform-impl/src/com/intellij/designer/model/Property.java
platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyEditor.java
platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java
platform/platform-impl/src/com/intellij/designer/propertyTable/editors/BooleanEditor.java [moved from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/editors/BooleanEditor.java with 100% similarity]
platform/platform-impl/src/com/intellij/designer/propertyTable/editors/ComboEditor.java [moved from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/editors/ComboEditor.java with 100% similarity]
platform/platform-impl/src/com/intellij/designer/propertyTable/editors/TextEditor.java [moved from plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/editors/TextEditor.java with 95% similarity]
platform/platform-impl/src/com/intellij/diagnostic/DevelopersLoader.java
platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java
platform/platform-impl/src/com/intellij/diagnostic/errordialog/DetailsTabForm.java
platform/platform-impl/src/com/intellij/ide/CommandLineProcessor.java
platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacro.java
platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java
platform/platform-impl/src/com/intellij/ide/actionMacro/actions/StartStopMacroRecordingAction.java
platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java
platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaInstaller.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaLaf.java [moved from platform/platform-impl/src/com/intellij/ide/ui/laf/DurculaLaf.java with 97% similarity]
platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaLookAndFeelInfo.java [moved from platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaDarkLookAndFeelInfo.java with 86% similarity]
platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java
platform/platform-impl/src/com/intellij/idea/StartupUtil.java
platform/platform-impl/src/com/intellij/openapi/application/impl/TransferToPooledThreadQueue.java
platform/platform-impl/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/KeyStokeMap.java
platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java
platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32FsCache.java
platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileSystemEntry.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFS.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/RefreshWorker.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MemoryUsagePanel.java
platform/platform-impl/src/com/intellij/platform/LocationNameFieldsBinding.java
platform/platform-impl/src/com/intellij/platform/ProjectBaseDirectory.java
platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
platform/platform-impl/src/com/intellij/ui/ColorPicker.java
platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java
platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java
platform/platform-impl/src/com/intellij/ui/popup/list/GroupedItemsListRenderer.java
platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupModel.java
platform/platform-impl/src/com/intellij/ui/popup/util/MnemonicsSearch.java
platform/platform-main/src/com/intellij/idea/MainImpl.java
platform/platform-resources-en/src/messages/ApplicationBundle.properties
platform/platform-resources-en/src/messages/ToolsBundle.properties
platform/platform-resources-en/src/misc/registry.properties
platform/platform-resources/src/META-INF/LangExtensions.xml
platform/platform-resources/src/META-INF/XmlPlugin.xml
platform/platform-resources/src/componentSets/Platform.xml
platform/platform-tests/testSrc/com/intellij/history/integration/IdeaGatewayTest.java
platform/platform-tests/testSrc/com/intellij/history/integration/revertion/DifferenceReverterTest.java
platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeLexerTest.groovy
platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java
platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkHandlingTest.java
platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexFacade.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelBase.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
platform/projectModel-impl/src/com/intellij/project/model/impl/module/content/JpsContentEntry.java
platform/projectModel-impl/src/com/intellij/project/model/impl/module/content/JpsSourceFolder.java
platform/projectModel-impl/src/com/intellij/project/model/impl/module/dependencies/JpsSdkOrderEntryBase.java
platform/testFramework/src/com/intellij/testFramework/LexerTestCase.java
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.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/impl/CodeInsightTestFixtureImpl.java
platform/usageView/src/com/intellij/usages/impl/rules/DirectoryGroupingRule.java
platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java
platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java
platform/util-rt/src/com/intellij/util/containers/HashMap.java [moved from platform/util/src/com/intellij/util/containers/HashMap.java with 96% similarity]
platform/util-rt/src/com/intellij/util/containers/HashSet.java [moved from platform/util/src/com/intellij/util/containers/HashSet.java with 86% similarity]
platform/util/src/com/intellij/execution/process/UnixProcessManager.java
platform/util/src/com/intellij/execution/rmi/RemoteUtil.java
platform/util/src/com/intellij/openapi/CompositeDisposable.java [new file with mode: 0644]
platform/util/src/com/intellij/openapi/util/JDOMUtil.java
platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java
platform/util/src/com/intellij/openapi/util/io/FileUtil.java
platform/util/src/com/intellij/openapi/util/io/win32/IdeaWin32.java
platform/util/src/com/intellij/openapi/util/text/StringUtil.java
platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
platform/util/src/com/intellij/psi/codeStyle/NameUtil.java
platform/util/src/com/intellij/ui/ColorUtil.java
platform/util/src/com/intellij/ui/Colored.java
platform/util/src/com/intellij/ui/SideBorder.java
platform/util/src/com/intellij/util/cls/ClsUtil.java
platform/util/src/com/intellij/util/containers/CollectionFactory.java
platform/util/src/com/intellij/util/containers/ContainerUtil.java
platform/util/src/com/intellij/util/containers/FlatteningIterator.java [new file with mode: 0644]
platform/util/src/com/intellij/util/containers/IntArrayList.java
platform/util/src/com/intellij/util/containers/LazyIterator.java [deleted file]
platform/util/src/com/intellij/util/containers/TransferToEDTQueue.java
platform/util/src/com/intellij/util/ui/UIUtil.java
platform/util/src/com/intellij/util/ui/tree/WideSelectionTreeUI.java
platform/util/testSrc/com/intellij/openapi/util/io/FileAttributesReadingTest.java
platform/util/testSrc/com/intellij/openapi/util/io/IoTestUtil.java
platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserManyUnversionedFilesNode.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/DefaultFileIndexFacade.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
platform/vcs-impl/src/com/intellij/openapi/vcs/update/AbstractCommonUpdateAction.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointManagerImpl.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointMasterDetailPopupBuilder.java
plugins/InspectionGadgets/src/META-INF/plugin.xml
plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspectionVisitor.java
plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToNullInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NegatedEqualityExpressionInspection.java [new file with mode: 0644]
plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SimplifiableEqualsExpressionInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowsRuntimeExceptionInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceVariableFix.java [new file with mode: 0644]
plugins/InspectionGadgets/src/com/siyeh/ig/j2me/MethodCallInLoopConditionInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/HtmlTagCanBeJavadocTagInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/logging/LoggingConditionDisagreesWithLogStatementInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/packaging/ClassOnlyUsedInOnePackageInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/performance/RedundantStringFormatCallInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/SerializationUtils.java
plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableHasSerialVersionUIDFieldInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableWithUnconstructableAncestorInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/style/ChainedMethodCallInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/style/NestedMethodCallInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java
plugins/InspectionGadgets/src/inspectionDescriptions/LoggingConditionDisagreesWithLogStatement.html
plugins/InspectionGadgets/src/inspectionDescriptions/NegatedEqualityExpression.html [new file with mode: 0644]
plugins/InspectionGadgets/src/inspectionDescriptions/SizeReplaceableByIsEmpty.html
plugins/InspectionGadgets/src/inspectionDescriptions/ThrowsRuntimeException.html
plugins/InspectionGadgets/test/com/siyeh/igfixes/javadoc/html_tag_can_be_javadoc_tag/Braces.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/javadoc/html_tag_can_be_javadoc_tag/Braces.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/javadoc/html_tag_can_be_javadoc_tag/Multiline.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/javadoc/html_tag_can_be_javadoc_tag/Multiline.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/javadoc/html_tag_can_be_javadoc_tag/Second.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/javadoc/html_tag_can_be_javadoc_tag/Second.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/classlayout/emptyclass/EmptyClass.java
plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/simplifiable_equals_expression/SimplifiableEqualsExpression.java
plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/simplifiable_equals_expression/expected.xml
plugins/InspectionGadgets/test/com/siyeh/igtest/javadoc/html_tag_can_be_javadoc_tag/HtmlTagCanBeJavadocTag.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/javadoc/html_tag_can_be_javadoc_tag/expected.xml [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/performance/redundant_string_format_call/RedundantStringFormatCall.java
plugins/InspectionGadgets/test/com/siyeh/igtest/performance/redundant_string_format_call/expected.xml
plugins/InspectionGadgets/test/com/siyeh/igtest/serialization/NonserializableGrandarent.java [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/serialization/SerializableParent.java [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/serialization/SerializableWithUnconstructableAncestorInspection.java [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/serialization/serializable_with_unconstructable_ancestor/SerializableWithUnconstructableAncestor.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/serialization/serializable_with_unconstructable_ancestor/expected.xml [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/style/size_replaceable_by_is_empty/SizeReplaceableByIsEmpty.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/javadoc/HtmlTagCanBeJavadocTagFixTest.java [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/javadoc/HtmlTagCanBeJavadocTagInspectionTest.java [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/serialization/SerializableWithUnconstructableAncestorInspectionTest.java [new file with mode: 0644]
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/ConcatenationInjector.java
plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java
plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
plugins/android-designer/src/com/intellij/android/designer/propertyTable/CompoundProperty.java
plugins/android-designer/src/com/intellij/android/designer/propertyTable/editors/ResourceEditor.java
plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java
plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java
plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPackagingBuilder.java
plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPlatform.java
plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java
plugins/android/jps-plugin/src/org/jetbrains/jps/android/model/JpsAndroidModuleExtension.java
plugins/android/jps-plugin/src/org/jetbrains/jps/android/model/JpsAndroidSdkProperties.java
plugins/android/jps-plugin/src/org/jetbrains/jps/android/model/JpsAndroidSdkType.java
plugins/android/jps-plugin/src/org/jetbrains/jps/android/model/impl/JpsAndroidModelSerializerExtension.java
plugins/android/jps-plugin/src/org/jetbrains/jps/android/model/impl/JpsAndroidModuleExtensionImpl.java
plugins/android/jps-plugin/src/org/jetbrains/jps/android/model/impl/JpsAndroidModuleProperties.java
plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.form
plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurable.java
plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java
plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProviderImpl.java
plugins/devkit/jps-plugin/devkit-jps-plugin.iml
plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/builder/JpsPluginSyntheticArtifactProvider.java
plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/model/JpsIdeaSdkProperties.java
plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/model/JpsIdeaSdkType.java
plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/model/JpsPluginModuleProperties.java
plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/model/JpsPluginModuleType.java
plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/model/impl/JpsDevKitModelSerializerExtension.java
plugins/devkit/jps-plugin/testSrc/org/jetbrains/jps/devkit/model/JpsPluginProjectSerializationTest.java [new file with mode: 0644]
plugins/devkit/src/references/extensions/ExtensionPointQuickDocProvider.java
plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java
plugins/git4idea/git4idea.iml
plugins/git4idea/src/git4idea/PlatformFacade.java
plugins/git4idea/src/git4idea/PlatformFacadeImpl.java
plugins/git4idea/src/git4idea/attributes/GitAttribute.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/attributes/GitCheckAttrParser.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.java
plugins/git4idea/src/git4idea/commands/Git.java
plugins/git4idea/src/git4idea/commands/GitCommand.java
plugins/git4idea/src/git4idea/commands/GitImpl.java
plugins/git4idea/src/git4idea/config/GitConfigUtil.java
plugins/git4idea/src/git4idea/config/GitVcsPanel.form
plugins/git4idea/src/git4idea/config/GitVcsPanel.java
plugins/git4idea/src/git4idea/config/GitVcsSettings.java
plugins/git4idea/src/git4idea/config/GitVersion.java
plugins/git4idea/src/git4idea/crlf/GitCrlfDialog.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/crlf/GitCrlfProblemsDetector.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/crlf/GitCrlfUtil.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/history/GitLogParser.java
plugins/git4idea/src/git4idea/push/GitPushDialog.java
plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
plugins/git4idea/tests/git4idea/attributes/GitCheckAttrParserTest.groovy [new file with mode: 0644]
plugins/git4idea/tests/git4idea/crlf/GitCrlfProblemsDetectorTest.groovy [new file with mode: 0644]
plugins/git4idea/tests/git4idea/roots/AbstractGitRootTest.groovy
plugins/git4idea/tests/git4idea/test/GitExec.java
plugins/git4idea/tests/git4idea/test/GitExecutor.groovy [moved from java/java-tests/testSrc/com/intellij/codeInsight/daemon/LambdaParamsTest.java with 51% similarity]
plugins/git4idea/tests/git4idea/test/GitFastTest.groovy
plugins/git4idea/tests/git4idea/test/GitGTestUtil.groovy
plugins/git4idea/tests/git4idea/test/GitMockProject.groovy
plugins/git4idea/tests/git4idea/test/GitMockVirtualFile.groovy
plugins/git4idea/tests/git4idea/test/GitTestImpl.groovy [new file with mode: 0644]
plugins/git4idea/tests/git4idea/test/GitTestPlatformFacade.java
plugins/git4idea/tests/git4idea/test/GitTestRepositoryManager.java
plugins/git4idea/tests/git4idea/test/GitTestRunEnv.java
plugins/git4idea/tests/git4idea/test/GitTestUtil.java
plugins/git4idea/tests/git4idea/test/MockGit.groovy
plugins/git4idea/tests/git4idea/tests/GitVersionTest.java
plugins/git4idea/tests/git4idea/tests/data/bin/git [deleted file]
plugins/git4idea/tests/git4idea/tests/data/bin/git.exe [deleted file]
plugins/git4idea/tests/git4idea/tests/data/bin/libiconv2.dll [deleted file]
plugins/groovy/resources/standardDsls/defaultMethods.gdsl
plugins/groovy/rt/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
plugins/groovy/src/META-INF/plugin.xml
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java
plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java
plugins/groovy/src/org/jetbrains/plugins/groovy/dgm/GroovyExtensionProvider.java
plugins/groovy/src/org/jetbrains/plugins/groovy/geb/GebBrowserMemberContributor.java [new file with mode: 0644]
plugins/groovy/src/org/jetbrains/plugins/groovy/geb/GebJUnitTestMemberContributor.java [new file with mode: 0644]
plugins/groovy/src/org/jetbrains/plugins/groovy/geb/GebSpockTestMemberContributor.java [new file with mode: 0644]
plugins/groovy/src/org/jetbrains/plugins/groovy/geb/GebUtil.java [new file with mode: 0644]
plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/strings/ConvertConcatenationToGstringIntention.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionConfidence.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyInsertHandler.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyMembersGetter.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/GroovySmartEnterProcessor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/fixers/GrMethodCallWithSingleClosureArgFixer.java [new file with mode: 0644]
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/smartEnter/processors/GroovyPlainEnterProcessor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/GroovyElementTypes.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/typeDefinitions/TypeDefinition.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyDirectInheritorsSearcher.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrFieldStub.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrMethodStub.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrFieldElementType.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrMethodElementType.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrStubFileElementType.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/JavaResolverProcessor.java [new file with mode: 0644]
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/geb/AbstractGebLightTestCase.groovy [new file with mode: 0644]
plugins/groovy/test/org/jetbrains/plugins/groovy/geb/GebTestsTest.groovy [new file with mode: 0644]
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyStructureViewTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/TypesParsingTest.java
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethodTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/smartEnter/SmartEnterTest.groovy [new file with mode: 0644]
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/smartEnter/SmartEnterTest.java [deleted file]
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.groovy [moved from plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.java with 74% similarity]
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/IntroduceParameterTest.groovy [moved from plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/IntroduceParameterTest.java with 65% similarity]
plugins/groovy/test/org/jetbrains/plugins/groovy/util/TestUtils.java
plugins/groovy/testdata/groovy/completion/smart/GlobalListCreators.groovy [new file with mode: 0644]
plugins/groovy/testdata/groovy/completion/smart/GlobalStaticMembers.groovy [new file with mode: 0644]
plugins/groovy/testdata/groovy/completion/smart/InnerClassReferenceWithoutQualifier_after.groovy
plugins/groovy/testdata/groovy/completion/smart/ShortenNamesInSmartCompletionAfterNewInDeclaration_after.groovy
plugins/groovy/testdata/groovy/oldCompletion/keyword/file12.test
plugins/groovy/testdata/groovy/oldCompletion/keyword/mod4.test
plugins/groovy/testdata/groovy/oldCompletion/keyword/var1.test
plugins/groovy/testdata/groovy/oldCompletion/keyword/var2.test
plugins/groovy/testdata/groovy/refactoring/inlineMethod/inlineVarargs.test [new file with mode: 0644]
plugins/groovy/testdata/mockGeb/geb-core-0.7.1.jar [new file with mode: 0644]
plugins/groovy/testdata/mockGeb/geb-junit4-0.7.0.jar [new file with mode: 0644]
plugins/groovy/testdata/mockGeb/geb-spock-0.7.1.jar [new file with mode: 0644]
plugins/groovy/testdata/parsing/groovy/types/interfaceWithGroovyDoc.test [new file with mode: 0644]
plugins/groovy/testdata/refactoring/introduceParameter/introduceConstantField/IntroduceConstantFieldAfter.groovy [new file with mode: 0644]
plugins/groovy/testdata/refactoring/introduceParameter/introduceConstantField/IntroduceConstantFieldBefore.groovy [new file with mode: 0644]
plugins/groovy/testdata/refactoring/introduceParameter/introduceConstantField/IntroduceConstantFieldMyClass.java [new file with mode: 0644]
plugins/hg4idea/hg4idea.iml
plugins/hg4idea/src/org/zmlx/hg4idea/HgChange.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgContentRevision.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgFile.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgFileRevision.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgGlobalSettings.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgRevisionNumber.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommandResultNotifier.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMqRebaseAction.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCatCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgChangesetsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommitCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgHeadsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgMergeCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPullCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPushCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgResolveCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevertCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevisionsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgShowConfigCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgTagBranchCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgTagCreateCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgTrackFileNamesAccrossRevisionsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgUpdateCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgVersionCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCurrentContentRevision.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotation.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgIntegrateEnvironment.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationProjectPanel.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgCurrentBranchStatus.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgPullDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgPushDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgTagDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/util/HgErrorUtil.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDiffProviderTest.java
plugins/junit/src/com/intellij/execution/junit/TestObject.java
plugins/junit/src/com/intellij/execution/junit2/ui/actions/RerunFailedTestsAction.java
plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/CustomModelInterpolator.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenExternalParameters.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParameters.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenFoldersImporter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettings.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenProblemFileHighlighter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUIUtil.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/Path.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectOpenProcessor.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/AnnotationProcessorImportingTest.groovy [new file with mode: 0644]
plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenDontExcludeTargetTest.groovy [new file with mode: 0644]
plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsManagerTest.java
plugins/spellchecker/src/com/intellij/spellchecker/jetbrains.dic
plugins/svn4idea/src/org/jetbrains/idea/svn/Idea87218Test.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/CleanupWorker.java
plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/TreeConflictRefreshablePanel.java
plugins/svn4idea/testData/move2unv/.svn/entries [new file with mode: 0644]
plugins/svn4idea/testData/move2unv/.svn/format [new file with mode: 0644]
plugins/svn4idea/testData/move2unv/.svn/pristine/27/27bb0e7f78e2c633876d2d513ef1f37cf8ad8ddd.svn-base [new file with mode: 0644]
plugins/svn4idea/testData/move2unv/.svn/pristine/95/958a34528dc8e091b6464dcc8f75aba989ec26a6.svn-base [new file with mode: 0644]
plugins/svn4idea/testData/move2unv/.svn/wc.db [new file with mode: 0644]
plugins/svn4idea/testData/move2unv/ewewew.txt [new file with mode: 0644]
plugins/svn4idea/testData/move2unv/file1.txt [new file with mode: 0644]
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnBusyOnAddTest.java [new file with mode: 0644]
plugins/tasks/tasks-api/src/com/intellij/tasks/TaskManager.java
plugins/tasks/tasks-core/src/META-INF/plugin.xml
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java [new file with mode: 0644]
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskAction.java
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.form [moved from plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ActivateTaskDialog.form with 98% similarity]
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java [moved from plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ActivateTaskDialog.java with 98% similarity]
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SimpleOpenTaskDialog.form [new file with mode: 0644]
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SimpleOpenTaskDialog.java [new file with mode: 0644]
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskAction.java
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java [new file with mode: 0644]
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskChangelistSupport.java
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java
plugins/tasks/tasks-core/src/icons/web.png [new file with mode: 0644]
plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java
plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskManagerTestCase.java
plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskVcsTest.java
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
plugins/testng/src/com/theoryinpractice/testng/ui/actions/RerunFailedTestsAction.java
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeContentProvider.java
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowColumns.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/context/ContextProvider.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ShowXPathAction.java
resources/src/META-INF/IdeaPlugin.xml
test-log.xml
xml/dom-impl/src/META-INF/DomPlugin.xml
xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java
xml/dom-impl/src/com/intellij/util/xml/impl/AddChildInvocation.java
xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java
xml/dom-impl/src/com/intellij/util/xml/impl/AttributeChildInvocationHandler.java
xml/dom-impl/src/com/intellij/util/xml/impl/CollectionElementInvocationHandler.java
xml/dom-impl/src/com/intellij/util/xml/impl/DomFileElementImpl.java
xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java
xml/dom-impl/src/com/intellij/util/xml/impl/DomRootInvocationHandler.java
xml/dom-impl/src/com/intellij/util/xml/impl/DomSemContributor.java
xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java
xml/dom-impl/src/com/intellij/util/xml/impl/FileDescriptionCachedValueProvider.java
xml/dom-impl/src/com/intellij/util/xml/impl/GetAttributeChildInvocation.java
xml/dom-impl/src/com/intellij/util/xml/impl/GetCollectionChildInvocation.java
xml/dom-impl/src/com/intellij/util/xml/impl/GetCompositeCollectionInvocation.java
xml/dom-impl/src/com/intellij/util/xml/impl/GetFixedChildInvocation.java
xml/dom-impl/src/com/intellij/util/xml/impl/GetInvocation.java
xml/dom-impl/src/com/intellij/util/xml/impl/IndexedElementInvocationHandler.java
xml/dom-impl/src/com/intellij/util/xml/impl/Invocation.java
xml/dom-impl/src/com/intellij/util/xml/impl/InvocationCache.java
xml/dom-impl/src/com/intellij/util/xml/impl/PropertyAccessorInvocation.java
xml/dom-impl/src/com/intellij/util/xml/impl/SetInvocation.java
xml/dom-impl/src/com/intellij/util/xml/impl/StaticGenericInfo.java
xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureTreeElement.java
xml/dom-impl/src/com/intellij/util/xml/stubs/AttributeStub.java
xml/dom-impl/src/com/intellij/util/xml/stubs/AttributeStubSerializer.java
xml/dom-impl/src/com/intellij/util/xml/stubs/DomElementTypeHolder.java
xml/dom-impl/src/com/intellij/util/xml/stubs/DomStub.java
xml/dom-impl/src/com/intellij/util/xml/stubs/ElementStub.java [moved from xml/dom-impl/src/com/intellij/util/xml/stubs/TagStub.java with 75% similarity]
xml/dom-impl/src/com/intellij/util/xml/stubs/ElementStubSerializer.java [moved from xml/dom-impl/src/com/intellij/util/xml/stubs/TagStubSerializer.java with 64% similarity]
xml/dom-impl/src/com/intellij/util/xml/stubs/FileStub.java [new file with mode: 0644]
xml/dom-impl/src/com/intellij/util/xml/stubs/FileStubSerializer.java [new file with mode: 0644]
xml/dom-impl/src/com/intellij/util/xml/stubs/StubParentStrategy.java [new file with mode: 0644]
xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java [moved from xml/dom-impl/src/com/intellij/util/xml/stubs/DomStubBuilder.java with 65% similarity]
xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilderVisitor.java [new file with mode: 0644]
xml/dom-openapi/src/com/intellij/util/xml/EvaluatedXmlNameImpl.java
xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolder.java
xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsInspection.java
xml/dom-tests/testData/performance.xml [new file with mode: 0644]
xml/dom-tests/testData/stubs/foo.xml
xml/dom-tests/tests/com/intellij/util/xml/DomConcurrencyStressTest.java
xml/dom-tests/tests/com/intellij/util/xml/stubs/Bar.java [new file with mode: 0644]
xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java [new file with mode: 0644]
xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubTest.java [moved from xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubsTest.java with 58% similarity]
xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubUsingTest.java [new file with mode: 0644]
xml/dom-tests/tests/com/intellij/util/xml/stubs/Foo.java
xml/impl/src/com/intellij/javaee/DefaultHtmlDoctypeInitialConfigurator.java [new file with mode: 0644]
xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java
xml/impl/src/com/intellij/psi/formatter/MarkupLineWrapPositionStrategy.java
xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
xml/impl/src/com/intellij/xml/Html5SchemaProvider.java
xml/impl/src/com/intellij/xml/util/IncludedXmlTag.java

index 62fc0d58ab9b716090a7bde7199c3406ae31d259..bb9c214e8025bf8c5e5dd8506fd8b3a2e557135d 100644 (file)
Binary files a/bin/win/IdeaWin32.dll and b/bin/win/IdeaWin32.dll differ
index 4f67183261bafbec0b1e733051b9d14d7d651b40..18b3e1493336b26100be5770b0ac1b5c6db05560 100644 (file)
Binary files a/bin/win/IdeaWin64.dll and b/bin/win/IdeaWin64.dll differ
index c867e12758959ec5673156890e3b657480c25d60..fe591aa095df5120bde87b353c623c605cb54494 100644 (file)
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-120.SNAPSHOT\r
+122.SNAPSHOT\r
index 77e537d09b3f6c8a58f9acd3c944572831a94dbe..22a95cbbb7bfab6690afcf4a2b59490e6ce59d20 100644 (file)
Binary files a/build/lib/gant/jps-sources.zip and b/build/lib/gant/jps-sources.zip differ
index 15799992ceb2c908dfc1a815f54adfa2717d0d69..a28e71ec51e707451473bfde1a1a46b83e7be97a 100644 (file)
Binary files a/build/lib/gant/lib/jps-programRunner.jar and b/build/lib/gant/lib/jps-programRunner.jar differ
index d379f63b1a066a5f2c81229b4577681ccbb2ae0c..f90062046f2e0e8fdbfcc21e87a294fd998df757 100644 (file)
Binary files a/build/lib/gant/lib/jps.jar and b/build/lib/gant/lib/jps.jar differ
index f5ceecb3f402c868e6884e5243e5878f1c3b0b08..5603df66909ab6d99d4f5856a0114cd7d45b03ff 100644 (file)
@@ -224,12 +224,6 @@ public def layoutCommunityPlugins(String home) {
       fileset(dir: "$home/plugins/maven/maven2-server-impl/lib")
     }
 
-    layoutPlugin("gradle") {
-      jar("gradle.jar") {
-        module("gradle")
-      }
-    }
-
     layoutPlugin("rearranger") {
       jar("rearranger.jar") {
         module("rearranger")
index e9f21b61bf4fed0a8e8f39a4eff1cb9b6d3b1d8b..73c43e8d279341dbbf9f119b31bfadad03790045 100644 (file)
@@ -237,6 +237,7 @@ libraryLicense(name: "protobuf", version: "2.3.0", license: "New BSD", url: "htt
 libraryLicense(name: "Netty", libraryName: "Netty", version: "3.3.1", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "Kryo", libraryName: "Kryo", version: "1.04", license: "New BSD License", url: "http://code.google.com/p/kryo/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php")
 libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "1.0.4.1", license: "Apache 2.0", url: "http://code.google.com/p/snappy-java/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
+libraryLicense(name: "Cucumber-JVM", libraryName: "cucumber-jvm", version: "1.0.11", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
 jetbrainsLibrary("JPS")
 jetbrainsLibrary("Maven Embedder")
 jetbrainsLibrary("tcServiceMessages")
index 6d67633f26f22cecdaf0389d007e7fd467bb2d97..3c0dfa750cec0aadc372cb0cf6d4209bbc5cd057 100644 (file)
@@ -178,7 +178,7 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements
       previous = myModuleBytecodeTarget.put(module.getName(), level);
     }
     if (!Comparing.equal(previous, level)) {
-      final Project project = module.getProject();
+      //final Project project = module.getProject(); // todo[jeka] so what?
     }
   }
 
@@ -187,7 +187,7 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements
   public String getBytecodeTargetLevel(Module module) {
     final String level = myModuleBytecodeTarget.get(module.getName());
     if (level != null) {
-      return "".equals(level)? null : level;
+      return level.isEmpty() ? null : level;
     }
     return myBytecodeTargetLevel;
   }
@@ -384,6 +384,27 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements
     myModuleProcessorProfiles.addAll(moduleProfiles);
   }
 
+  @Nullable
+  public ProcessorConfigProfile findModuleProcessorProfile(@NotNull String name) {
+    for (ProcessorConfigProfile profile : myModuleProcessorProfiles) {
+      if (name.equals(profile.getName())) {
+        return profile;
+      }
+    }
+
+    return null;
+  }
+
+  public void removeModuleProcessorProfile(ProcessorConfigProfile profile) {
+    myModuleProcessorProfiles.remove(profile);
+    myProcessorsProfilesMap = null; // clear cache
+  }
+
+  public void addModuleProcessorProfile(@NotNull ProcessorConfigProfile profile) {
+    myModuleProcessorProfiles.add(profile);
+    myProcessorsProfilesMap = null; // clear cache
+  }
+
   @Override
   @NotNull
   public ProcessorConfigProfile getAnnotationProcessingConfiguration(Module module) {
index 61a57e3e2483445d5afa6c522b52326aabce9486..2980b7862698a87c71cc4c5d2126264662a2ec80 100644 (file)
@@ -563,6 +563,8 @@ public class BuildManager implements ApplicationComponent{
     final CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings.Builder cmdBuilder =
       CmdlineRemoteProto.Message.ControllerMessage.GlobalSettings.newBuilder();
 
+    cmdBuilder.setGlobalOptionsPath(PathManager.getOptionsPath());
+
     if (!data.isEmpty()) {
       for (Map.Entry<String, String> entry : data.entrySet()) {
         final String var = entry.getKey();
index 9968fdbe3fb68729fa665f94c5db563e24851c21..d57d0f3c8d5ba13655de1065084ea9bb2e26e8df 100644 (file)
@@ -50,6 +50,9 @@ public class DeploymentUtilImpl extends DeploymentUtil {
                        @Nullable Set<String> writtenPaths,
                        @Nullable FileFilter fileFilter) throws IOException {
     if (fileFilter != null && !fileFilter.accept(fromFile)) {
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Skipping " + fromFile.getAbsolutePath() + ": it wasn't accepted by filter " + fileFilter);
+      }
       return;
     }
     checkPathDoNotNavigatesUpFromFile(fromFile);
@@ -69,13 +72,19 @@ public class DeploymentUtilImpl extends DeploymentUtil {
     }
     if (fromFile.equals(toFile)
         || writtenPaths != null && !writtenPaths.add(toFile.getPath())) {
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Skipping " + fromFile.getAbsolutePath() + ": " + toFile.getAbsolutePath() + " is already written");
+      }
       return;
     }
-    if (!FileUtil.isFilePathAcceptable(toFile, fileFilter)) return;
-    if (context.getProgressIndicator() != null) {
-      context.getProgressIndicator().setText("Copying files");
-      context.getProgressIndicator().setText2(fromFile.getPath());
+    if (!FileUtil.isFilePathAcceptable(toFile, fileFilter)) {
+      if (LOG.isDebugEnabled()) {
+        LOG.debug("Skipping " + fromFile.getAbsolutePath() + ": " + toFile.getAbsolutePath() + " wasn't accepted by filter " + fileFilter);
+      }
+      return;
     }
+    context.getProgressIndicator().setText("Copying files");
+    context.getProgressIndicator().setText2(fromFile.getPath());
     try {
       if (LOG.isDebugEnabled()) {
         LOG.debug("Copy file '" + fromFile + "' to '"+toFile+"'");
index 88398caa22dfc8945a8cc1b397bc8d1201a086c6..25f36097be96c08dc3527386ac155d4373c7615e 100644 (file)
@@ -222,8 +222,9 @@ public class JavaDebuggerSupport extends DebuggerSupport {
 
     @Override
     public void addListener(final BreakpointsListener listener, Project project) {
-      final MyBreakpointManagerListener listener1 = new MyBreakpointManagerListener(listener);
-      DebuggerManagerEx.getInstanceEx(getCurrentProject()).getBreakpointManager().addBreakpointManagerListener(listener1);
+      BreakpointManager breakpointManager = DebuggerManagerEx.getInstanceEx(getCurrentProject()).getBreakpointManager();
+      final MyBreakpointManagerListener listener1 = new MyBreakpointManagerListener(listener, breakpointManager);
+      breakpointManager.addBreakpointManagerListener(listener1);
       myListeners.add(listener1);
     }
 
@@ -231,6 +232,8 @@ public class JavaDebuggerSupport extends DebuggerSupport {
     public void removeListener(BreakpointsListener listener) {
       for (MyBreakpointManagerListener managerListener : myListeners) {
         if (managerListener.myListener == listener) {
+          BreakpointManager manager = managerListener.myBreakpointManager;
+          manager.removeBreakpointManagerListener(managerListener);
           myListeners.remove(managerListener);
           break;
         }
@@ -295,9 +298,12 @@ public class JavaDebuggerSupport extends DebuggerSupport {
     private static class MyBreakpointManagerListener implements BreakpointManagerListener {
 
       private final BreakpointsListener myListener;
+      public BreakpointManager myBreakpointManager;
 
-      public MyBreakpointManagerListener(BreakpointsListener listener) {
+
+      public MyBreakpointManagerListener(BreakpointsListener listener, BreakpointManager breakpointManager) {
         myListener = listener;
+        myBreakpointManager = breakpointManager;
       }
 
       @Override
index 6027682ba85bd26a7264c741f4b6dfa2973e9f53..f7823f066780f2662afb41e25474ee647c892143 100644 (file)
  */
 package com.intellij.debugger.ui.breakpoints;
 
-import com.intellij.debugger.DebuggerBundle;
-import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.ComboBoxAction;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.popup.JBPopup;
-import com.intellij.openapi.ui.popup.JBPopupListener;
-import com.intellij.openapi.ui.popup.LightweightWindowEvent;
+import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.UserDataHolderBase;
-import com.intellij.ui.popup.util.DetailView;
-import com.intellij.ui.popup.util.ItemWrapper;
+import com.intellij.ui.CollectionComboBoxModel;
+import com.intellij.ui.components.JBList;
+import com.intellij.ui.popup.util.*;
 import com.intellij.xdebugger.impl.breakpoints.ui.BreakpointItem;
-import com.intellij.xdebugger.impl.breakpoints.ui.tree.BreakpointMasterDetailPopupBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.awt.*;
-import java.util.Collection;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.List;
 
 public class BreakpointChooser {
-  private Project myProject;
 
   private DetailView myDetailView;
 
-  private ActionToolbar myActionToolbar;
-  private BreakpointItem myBreakpointItem;
-
   private Delegate myDelegate;
-  private final ComboBoxAction myComboBoxAction;
-  private BreakpointMasterDetailPopupBuilder myPopupBuilder;
 
-  private Object mySelectedBreakpoint;
+  private final ComboBox myComboBox;
+
+  private DetailController myDetailController;
+  private JBList myList;
 
   public void setDetailView(DetailView detailView) {
     myDetailView = detailView;
+    myDetailController.setDetailView(new MyDetailView(myDetailView.getEditorState()));
   }
 
   public Object getSelectedBreakpoint() {
-    return mySelectedBreakpoint;
-  }
-
-  public BreakpointItem getBreakpointItem() {
-    return myBreakpointItem;
-  }
-
-  public void setSelectedBreakpoint(Object selectedBreakpoint) {
-    mySelectedBreakpoint = selectedBreakpoint;
-    myBreakpointItem = selectedBreakpoint != null ? new JavaBreakpointItem(null, (Breakpoint)selectedBreakpoint) : null;
-    updatePresentation(myComboBoxAction.getTemplatePresentation(), myBreakpointItem);
+    return ((BreakpointItem)myComboBox.getSelectedItem()).getBreakpoint();
   }
 
   private void pop(DetailView.PreviewEditorState pushed) {
@@ -79,97 +63,57 @@ public class BreakpointChooser {
     }
   }
   public interface Delegate {
-    void breakpointChosen(Project project, BreakpointItem breakpointItem, JBPopup popup);
+    void breakpointChosen(Project project, BreakpointItem breakpointItem);
   }
 
-  public BreakpointChooser(Project project, Delegate delegate, Breakpoint baseBreakpoint) {
-    myProject = project;
+  public BreakpointChooser(final Project project, Delegate delegate, Breakpoint baseBreakpoint, List<BreakpointItem> breakpointItems) {
     myDelegate = delegate;
 
-    myPopupBuilder = new BreakpointMasterDetailPopupBuilder(myProject);
-    myPopupBuilder.setPlainView(true);
-
-    myComboBoxAction = new ComboBoxAction() {
-
+    BreakpointItem breakpointItem = null;
+    for (BreakpointItem item : breakpointItems) {
+      if (item.getBreakpoint() == baseBreakpoint) {
+        breakpointItem = item;
+        break;
+      }
+    }
+    myDetailController = new DetailController(new MasterController() {
+      JLabel fake = new JLabel();
       @Override
-      public void update(AnActionEvent e) {
-        final Presentation presentation = e.getPresentation();
-        updatePresentation(presentation, BreakpointChooser.this.myBreakpointItem);
+      public ItemWrapper[] getSelectedItems() {
+        return new ItemWrapper[]{((BreakpointItem)myList.getSelectedValue())};
       }
 
       @Override
-      protected ComboBoxButton createComboBoxButton(final Presentation presentation) {
-        return new ComboBoxButton(presentation) {
-          @Override
-          protected JBPopup createPopup(final Runnable onDispose) {
-            final DetailView.PreviewEditorState pushed = myDetailView.getEditorState();
-            myPopupBuilder.setIsViewer(true);
-            myPopupBuilder.setAddDetailViewToEast(false);
-            myPopupBuilder.setDetailView(new MyDetailView(pushed));
-            myPopupBuilder.setCallback(new BreakpointMasterDetailPopupBuilder.BreakpointChosenCallback() {
-              @Override
-              public void breakpointChosen(Project project, BreakpointItem breakpointItem, JBPopup popup, boolean withEnterOrDoubleClick) {
-                popup.cancel();
-                myBreakpointItem = breakpointItem;
-                mySelectedBreakpoint = breakpointItem.getBreakpoint();
-                updatePresentation(myComboBoxAction.getTemplatePresentation(), myBreakpointItem);
-                updatePresentation(presentation, myBreakpointItem);
-
-                if (myDelegate != null) {
-                  myDelegate.breakpointChosen(project, breakpointItem, popup);
-                }
-              }
-            });
-            myPopupBuilder.setIsViewer(true);
-            JBPopup popup = myPopupBuilder.createPopup();
-            popup.addListener(new JBPopupListener() {
-              @Override
-              public void beforeShown(LightweightWindowEvent event) {
-                //To change body of implemented methods use File | Settings | File Templates.
-              }
-
-              @Override
-              public void onClosed(LightweightWindowEvent event) {
-                onDispose.run();
-                pop(pushed);
-              }
-            });
-            return popup;
-          }
-
-
-        };
+      public JLabel getPathLabel() {
+        return fake;
       }
+    });
 
-      @NotNull
+    final ItemWrapperListRenderer listRenderer = new ItemWrapperListRenderer(project, null);
+
+    ComboBoxModel model = new CollectionComboBoxModel(breakpointItems, breakpointItem);
+    myComboBox = new ComboBox(model) {
       @Override
-      protected DefaultActionGroup createPopupActionGroup(JComponent button) {
-        assert false : "should not be here";
-        return null;
+      protected JBList createJBList(ComboBoxModel model) {
+        myList = super.createJBList(model);
+        myDetailController.setList(myList);
+        myList.setCellRenderer(listRenderer);
+        return myList;
       }
     };
-    setSelectedBreakpoint(baseBreakpoint);
-    myActionToolbar = ActionManager.getInstance().createActionToolbar("asdad", new DefaultActionGroup(myComboBoxAction), true);
-    myActionToolbar.setLayoutPolicy(ActionToolbar.WRAP_LAYOUT_POLICY);
-  }
-
-  public void setBreakpointItems(Collection<BreakpointItem> items) {
-    myPopupBuilder.setBreakpointItems(items);
-  }
-
-  private void updatePresentation(Presentation presentation, BreakpointItem breakpointItem) {
-    if (breakpointItem != null && breakpointItem.getBreakpoint() != null) {
-      presentation.setIcon(breakpointItem.getIcon());
-      presentation.setText(breakpointItem.getDisplayText());
-    }
-    else {
-      presentation.setText(DebuggerBundle.message("value.none"));
-    }
+    myComboBox.setRenderer(listRenderer);
 
+    myComboBox.setSwingPopup(false);
+    myComboBox.addItemListener(new ItemListener() {
+      @Override
+      public void itemStateChanged(ItemEvent event) {
+        myDelegate.breakpointChosen(project, ((BreakpointItem)myComboBox.getSelectedItem()));
+      }
+    });
   }
 
   public JComponent getComponent() {
-    return myActionToolbar.getComponent();
+    return myComboBox;
   }
 
   private class MyDetailView implements DetailView {
index 2465d872de87930971ad034b951e1a7bee2cc906..1d13ac9a49ac3eb389829e26e0bf665be7d780f8 100644 (file)
@@ -37,7 +37,6 @@ import com.intellij.openapi.editor.event.DocumentListener;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.FixedSizeButton;
-import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.IdeFocusManager;
@@ -49,8 +48,8 @@ import com.intellij.ui.SimpleColoredComponent;
 import com.intellij.ui.components.JBCheckBox;
 import com.intellij.ui.popup.util.DetailView;
 import com.intellij.util.IJSwingUtilities;
-import com.intellij.xdebugger.impl.breakpoints.ui.BreakpointItem;
 import com.intellij.xdebugger.impl.DebuggerSupport;
+import com.intellij.xdebugger.impl.breakpoints.ui.BreakpointItem;
 import com.intellij.xdebugger.impl.ui.DebuggerUIUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -662,7 +661,7 @@ public abstract class BreakpointPropertiesPanel {
 
     myMasterBreakpointChooser = new BreakpointChooser(myProject, new BreakpointChooser.Delegate() {
       @Override
-      public void breakpointChosen(Project project, BreakpointItem item, JBPopup popup) {
+      public void breakpointChosen(Project project, BreakpointItem item) {
         final boolean enabled = item != null && item.getBreakpoint() != null;
         myLeaveEnabledRadioButton.setEnabled(enabled);
         myDisableAgainRadio.setEnabled(enabled);
@@ -676,13 +675,10 @@ public abstract class BreakpointPropertiesPanel {
         updateMasterBreakpointPanel(findMasterBreakpointRule());
 
       }
-    }, baseBreakpoint);
+    }, baseBreakpoint, getBreakpointItemsExceptMy());
 
     insert(myDependentBreakpointComboPanel, myMasterBreakpointChooser.getComponent());
 
-
-    myMasterBreakpointChooser.setBreakpointItems(getBreakpointItemsExceptMy());
-
   }
 
   private @Nullable EnableBreakpointRule findMasterBreakpointRule() {
index 450161bd661a0596f92fc790701a02909db31292..97a5fd8f582c3545f6695da3cc87ea76022c2639 100644 (file)
@@ -19,6 +19,7 @@ import com.intellij.debugger.impl.DebuggerContextImpl;
 import com.intellij.debugger.impl.DebuggerContextListener;
 import com.intellij.debugger.impl.DebuggerStateManager;
 import com.intellij.debugger.ui.DebuggerView;
+import com.intellij.openapi.CompositeDisposable;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.AnAction;
@@ -28,13 +29,12 @@ import com.intellij.openapi.util.Disposer;
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.ArrayList;
 
 public abstract class UpdatableDebuggerView extends JPanel implements DebuggerView {
   private final Project myProject;
   private final DebuggerStateManager myStateManager;
   private volatile boolean myRefreshNeeded = true;
-  private final java.util.List<Disposable> myDisposables = new ArrayList<Disposable>();
+  private final CompositeDisposable myDisposables = new CompositeDisposable();
   private volatile boolean myUpdateEnabled;
 
   protected UpdatableDebuggerView(final Project project, final DebuggerStateManager stateManager) {
@@ -104,10 +104,7 @@ public abstract class UpdatableDebuggerView extends JPanel implements DebuggerVi
   }
 
   public void dispose() {
-    for (Disposable disposable : myDisposables) {
-      Disposer.dispose(disposable);
-    }
-    myDisposables.clear();
+    Disposer.dispose(myDisposables);
   }
 
   protected void overrideShortcut(final JComponent forComponent, final String actionId, final ShortcutSet shortcutSet) {
index 51f2c7e41a77faf2859f95cceb53f9dc415d3c58..40a91499fd2abfa6fe2b96d7936feded1956bd4e 100644 (file)
@@ -30,14 +30,13 @@ import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.execution.testframework.*;
 import com.intellij.idea.ActionsBundle;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Getter;
-import com.intellij.openapi.util.InvalidDataException;
-import com.intellij.openapi.util.JDOMExternalizable;
-import com.intellij.openapi.util.WriteExternalException;
+import com.intellij.openapi.ui.ComponentContainer;
+import com.intellij.openapi.util.*;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -48,9 +47,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
-public class AbstractRerunFailedTestsAction extends AnAction implements AnAction.TransparentUpdate {
-  private static List<AbstractRerunFailedTestsAction> registry = new ArrayList<AbstractRerunFailedTestsAction>();
+public class AbstractRerunFailedTestsAction extends AnAction implements AnAction.TransparentUpdate, Disposable {
+  private static List<AbstractRerunFailedTestsAction> registry = new CopyOnWriteArrayList<AbstractRerunFailedTestsAction>();
   private static final Logger LOG = Logger.getInstance("#com.intellij.execution.junit2.ui.actions.RerunFailedTestsAction");
   private TestFrameworkRunningModel myModel;
   private Getter<TestFrameworkRunningModel> myModelProvider;
@@ -64,11 +64,16 @@ public class AbstractRerunFailedTestsAction extends AnAction implements AnAction
     myParent = null;
   }
 
-  protected AbstractRerunFailedTestsAction(JComponent parent) {
-    myParent = parent;
+  protected AbstractRerunFailedTestsAction(@NotNull ComponentContainer componentContainer) {
+    myParent = componentContainer.getComponent();
     registry.add(this);
+    Disposer.register(componentContainer, this);
     copyFrom(ActionManager.getInstance().getAction("RerunFailedTests"));
-    registerCustomShortcutSet(getShortcutSet(), parent);
+    registerCustomShortcutSet(getShortcutSet(), myParent);
+  }
+
+  public void dispose() {
+    registry.remove(this);
   }
 
   public void init(final TestConsoleProperties consoleProperties,
diff --git a/java/java-impl/src/com/intellij/application/options/JavaArrangementPanel.java b/java/java-impl/src/com/intellij/application/options/JavaArrangementPanel.java
new file mode 100644 (file)
index 0000000..5c6d52b
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2000-2012 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.application.options;
+
+import com.intellij.application.options.codeStyle.arrangement.ArrangementSettingsPanel;
+import com.intellij.ide.highlighter.JavaFileType;
+import com.intellij.lang.java.JavaLanguage;
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.psi.codeStyle.CodeStyleSettings;
+import com.intellij.psi.codeStyle.arrangement.Rearranger;
+import com.intellij.psi.codeStyle.arrangement.settings.ArrangementStandardSettingsAware;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Denis Zhdanov
+ * @since 8/8/12 8:57 AM
+ */
+public class JavaArrangementPanel extends ArrangementSettingsPanel {
+
+  public JavaArrangementPanel(@NotNull CodeStyleSettings settings) {
+    super(settings, (ArrangementStandardSettingsAware)Rearranger.EXTENSION.forLanguage(JavaLanguage.INSTANCE));
+  }
+
+  @Override
+  protected int getRightMargin() {
+    return 80;
+  }
+
+  @NotNull
+  @Override
+  protected FileType getFileType() {
+    return JavaFileType.INSTANCE;
+  }
+
+  @Override
+  protected String getPreviewText() {
+    return null;
+  }
+}
index e7ecd1cfafe43b10b4290831fb1a906f347cd59d..0cb230cac1db01fb3bea8e926b8c44010d3e61c8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -34,6 +34,9 @@ public class JavaCodeStyleMainPanel extends TabbedLanguageCodeStylePanel {
     super.initTabs(settings);
     addTab(new JavaDocFormattingPanel(settings));
     addTab(new CodeStyleImportsPanelWrapper(settings));
+    if (Boolean.getBoolean("show.arrangement.options")) {
+      addTab(new JavaArrangementPanel(settings));
+    }
     for (CodeStyleSettingsProvider provider : Extensions.getExtensions(CodeStyleSettingsProvider.EXTENSION_POINT_NAME)) {
       if (provider.getLanguage() == JavaLanguage.INSTANCE && !provider.hasSettingsPage()) {
         createTab(provider);
index 7a780b9f2cea8a5576771a9d14b660c95e87db78..18e8fd2feb1313b9573475e38d81fb4791d7e456 100644 (file)
@@ -859,7 +859,9 @@ public class ExpectedTypesProvider {
         myResult = types;
       }
       else {
-        LOG.assertTrue(myExpr.equals(expr.getElseExpression()));
+        if (!myExpr.equals(expr.getElseExpression())) {
+          LOG.error(Arrays.asList(expr.getChildren()) + "; " + myExpr);
+        }
         myResult = getExpectedTypes(expr, myForCompletion);
         for (ExpectedTypeInfo info : myResult) {
           ((ExpectedTypeInfoImpl)info).setInsertExplicitTypeParams(true);
index e20c3569c1985777eb924eee8eda65bc5ee4f0f4..1904ccbb49a175852ec54d76ec53f5a508fc9a26 100644 (file)
@@ -19,7 +19,6 @@ import com.intellij.codeInsight.completion.simple.BracesTailType;
 import com.intellij.codeInsight.completion.simple.ParenthesesTailType;
 import com.intellij.codeInsight.completion.simple.RParenthTailType;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 
 public class TailTypes {
@@ -103,10 +102,24 @@ public class TailTypes {
     }
   };
   public static final TailType FINALLY_LBRACE = new BracesTailType() {
-    protected boolean isSpaceBeforeLBrace(final CodeStyleSettings styleSettings, final Editor editor, final int tailOffset) {
+    protected boolean isSpaceBeforeLBrace(final CommonCodeStyleSettings styleSettings, final Editor editor, final int tailOffset) {
       return styleSettings.SPACE_BEFORE_FINALLY_LBRACE;
     }
   };
+  public static final TailType TRY_LBRACE = new BracesTailType() {
+    @Override
+    protected boolean isSpaceBeforeLBrace(CommonCodeStyleSettings styleSettings, Editor editor, int tailOffset) {
+      return styleSettings.SPACE_BEFORE_TRY_LBRACE;
+    }
+  };
+  public static final TailType DO_LBRACE = new BracesTailType() {
+    @Override
+    protected boolean isSpaceBeforeLBrace(CommonCodeStyleSettings styleSettings, Editor editor, int tailOffset) {
+      return styleSettings.SPACE_BEFORE_DO_LBRACE;
+    }
+  };
+
+
 
   private TailTypes() {}
 }
index d5a3d0e213568b6ee28dc23c030df009b6af022c..ac68d64f57333901bdf012ee2ce78c4e628b5f73 100644 (file)
@@ -68,10 +68,12 @@ public class BasicExpressionCompletionContributor {
     }
 
     if (!AFTER_DOT.accepts(element)) {
-      new CollectionsUtilityMethodsProvider(parameters.getPosition(),
-                                            parameters.getExpectedType(),
-                                            parameters.getDefaultType(), result)
-        .addCompletions(parameters.getParameters().getInvocationCount() > 1 || StringUtil.isNotEmpty(matcher.getPrefix()));
+      if (parameters.getParameters().getInvocationCount() <= 1) {
+        new CollectionsUtilityMethodsProvider(parameters.getPosition(),
+                                              parameters.getExpectedType(),
+                                              parameters.getDefaultType(), result)
+          .addCompletions(StringUtil.isNotEmpty(matcher.getPrefix()));
+      }
       ClassLiteralGetter.addCompletions(parameters, result, matcher);
 
       final PsiElement position = parameters.getPosition();
index 92a4c9dc5aa3616345fa913909f85f866de63738..9a72690035b6bad483851587aaf1635de24880b6 100644 (file)
@@ -50,15 +50,6 @@ public class Java15CompletionData extends JavaCompletionData {
 
       registerVariant(variant);
     }
-
-    {
-      final CompletionVariant variant = new CompletionVariant(PsiJavaFile.class, CLASS_START);
-      variant.includeScopeClass(PsiClass.class);
-
-      variant.addCompletion(PsiKeyword.ENUM, TailType.HUMBLE_SPACE_BEFORE_WORD);
-      registerVariant(variant);
-    }
-
   }
 
   protected void initVariantsInClassScope() {
index d7215f034ae9c2674d494db6a1d5642b9ab86146..6344cc8dfe302fc80ff8b5ba237c1cf58f946aa9 100644 (file)
@@ -127,7 +127,7 @@ public class JavaCompletionContributor extends CompletionContributor {
 
     if (JavaCompletionData.AFTER_TRY_BLOCK.isAcceptable(position, position) ||
         JavaCompletionData.START_SWITCH.accepts(position) ||
-        JavaCompletionData.INSTANCEOF_PLACE.isAcceptable(position, position) ||
+        JavaCompletionData.isInstanceofPlace(position) ||
         JavaCompletionData.isAfterPrimitiveOrArrayType(position)) {
       return null;
     }
index 45c4e6e8d6e2da5bae1d82f54d3a1a0096caedc5..3d9b69bc6f5ab72d7dbcf7c804458b74c9116768 100644 (file)
@@ -50,7 +50,7 @@ public class JavaCompletionData extends JavaAwareCompletionData {
 
   private static final PsiElementPattern<PsiElement,?> AFTER_DOT = psiElement().afterLeaf(".");
 
-  public static final LeftNeighbour INSTANCEOF_PLACE = new LeftNeighbour(new OrFilter(
+  private static final LeftNeighbour INSTANCEOF_PLACE = new LeftNeighbour(new OrFilter(
       new ReferenceOnFilter(new ClassFilter(PsiVariable.class)),
       new TextFilter(PsiKeyword.THIS),
       new AndFilter(new TextFilter(")"), new ParentElementFilter(new AndFilter(
@@ -138,17 +138,6 @@ public class JavaCompletionData extends JavaAwareCompletionData {
         not(psiElement().inside(PsiAnnotation.class)),
         not(START_SWITCH));
 
-  public static final AndFilter CLASS_START = new AndFilter(
-    new OrFilter(
-      END_OF_BLOCK,
-      new PatternFilter(psiElement().afterLeaf(
-        or(
-          psiElement().withoutText(".").inside(psiElement(PsiModifierList.class).withParent(not(psiElement(PsiParameter.class)))).andNot(
-            psiElement().inside(PsiAnnotationParameterList.class)),
-          psiElement().isNull())))
-    ),
-    new PatternFilter(not(psiElement().afterLeaf("@"))));
-
   private static final String[] PRIMITIVE_TYPES = new String[]{
     PsiKeyword.SHORT, PsiKeyword.BOOLEAN,
     PsiKeyword.DOUBLE, PsiKeyword.LONG,
@@ -233,16 +222,6 @@ public class JavaCompletionData extends JavaAwareCompletionData {
   }
 
   protected void initVariantsInFileScope(){
-    {
-      final CompletionVariant variant = new CompletionVariant(PsiJavaFile.class, CLASS_START);
-      variant.includeScopeClass(PsiClass.class);
-
-      variant.addCompletion(PsiKeyword.CLASS);
-      variant.addCompletion(PsiKeyword.INTERFACE);
-
-      registerVariant(variant);
-    }
-
   }
 
   /**
@@ -323,17 +302,6 @@ public class JavaCompletionData extends JavaAwareCompletionData {
       registerVariant(variant);
     }
 
-    {
-// instanceof keyword
-      final ElementFilter position = INSTANCEOF_PLACE;
-      final CompletionVariant variant = new CompletionVariant(position);
-      variant.includeScopeClass(PsiExpression.class, true);
-      variant.includeScopeClass(PsiMethod.class);
-      variant.addCompletion(PsiKeyword.INSTANCEOF);
-
-      registerVariant(variant);
-    }
-
     {
 // Keyword completion in returns  !!!!
       final CompletionVariant variant = new CompletionVariant(PsiMethod.class, new LeftNeighbour(new TextFilter(PsiKeyword.RETURN)));
@@ -410,10 +378,10 @@ public class JavaCompletionData extends JavaAwareCompletionData {
   private static void addStatementKeywords(CompletionResultSet variant, PsiElement position) {
     variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.SWITCH), TailTypes.SWITCH_LPARENTH));
     variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.WHILE), TailTypes.WHILE_LPARENTH));
-    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.DO), TailType.createSimpleTailType('{')));
+    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.DO), TailTypes.DO_LBRACE));
     variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.FOR), TailTypes.FOR_LPARENTH));
     variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.IF), TailTypes.IF_LPARENTH));
-    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.TRY), TailType.createSimpleTailType('{')));
+    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.TRY), TailTypes.TRY_LBRACE));
     variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.THROW), TailType.INSERT_SPACE));
     variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.NEW), TailType.INSERT_SPACE));
     variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.SYNCHRONIZED), TailTypes.SYNCHRONIZED_LPARENTH));
@@ -513,11 +481,21 @@ public class JavaCompletionData extends JavaAwareCompletionData {
       result.addElement(TailTypeDecorator.withTail(createKeyword(position, PsiKeyword.FINAL), TailType.HUMBLE_SPACE_BEFORE_WORD));
     }
 
-    if (CLASS_START.isAcceptable(position, position) &&
-        PsiTreeUtil.getNonStrictParentOfType(position, PsiLiteralExpression.class, PsiComment.class) == null) {
+    if (isInstanceofPlace(position)) {
+      result.addElement(TailTypeDecorator.withTail(createKeyword(position, PsiKeyword.INSTANCEOF), TailType.HUMBLE_SPACE_BEFORE_WORD));
+    }
+
+    if (isSuitableForClass(position)) {
       for (String s : ModifierChooser.getKeywords(position)) {
         result.addElement(new OverrideableSpace(createKeyword(position, s), TailType.HUMBLE_SPACE_BEFORE_WORD));
       }
+      result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.CLASS), TailType.HUMBLE_SPACE_BEFORE_WORD));
+      if (PsiTreeUtil.getParentOfType(position, PsiCodeBlock.class, true, PsiMember.class) == null) {
+        result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.INTERFACE), TailType.HUMBLE_SPACE_BEFORE_WORD));
+        if (PsiUtil.getLanguageLevel(position).isAtLeast(LanguageLevel.JDK_1_5)) {
+          result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.ENUM), TailType.INSERT_SPACE));
+        }
+      }
     }
 
     addPrimitiveTypes(result, position);
@@ -538,9 +516,30 @@ public class JavaCompletionData extends JavaAwareCompletionData {
     }
   }
 
+  public static boolean isInstanceofPlace(PsiElement position) {
+    return INSTANCEOF_PLACE.isAcceptable(position, position);
+  }
+
+  public static boolean isSuitableForClass(PsiElement position) {
+    if (psiElement().afterLeaf("@").accepts(position) ||
+        PsiTreeUtil.getNonStrictParentOfType(position, PsiLiteralExpression.class, PsiComment.class) != null) {
+      return false;
+    }
+
+    if (psiElement().afterLeaf(
+      or(
+        psiElement().withoutText(".").inside(psiElement(PsiModifierList.class).withParent(not(psiElement(PsiParameter.class)))).andNot(
+          psiElement().inside(PsiAnnotationParameterList.class)),
+        psiElement().isNull())).accepts(position)) {
+      return true;
+    }
+
+    return END_OF_BLOCK.isAcceptable(position, position);
+  }
+
   static void addExpectedTypeMembers(CompletionParameters parameters, final CompletionResultSet result, PsiElement position) {
     for (final ExpectedTypeInfo info : JavaSmartCompletionContributor.getExpectedTypes(parameters)) {
-      new JavaMembersGetter(info.getDefaultType(), position).addMembers(parameters, parameters.getInvocationCount() > 1, new Consumer<LookupElement>() {
+      new JavaMembersGetter(info.getDefaultType(), parameters).addMembers(parameters.getInvocationCount() > 1, new Consumer<LookupElement>() {
         @Override
         public void consume(LookupElement element) {
           result.addElement(element);
index 3a96b71d9076a35f08d88f9348ebbc959e6c8316..e113fa2159d9439b95361d70b23c7c9b37926b0e 100644 (file)
@@ -382,10 +382,6 @@ public class JavaCompletionSorting {
       final Object object = element.getObject();
       if (object instanceof PsiDocCommentOwner) {
         final PsiDocCommentOwner member = (PsiDocCommentOwner)object;
-        if (!member.isValid()) {
-          return MyEnum.NORMAL;
-        }
-
         if (!JavaPsiFacade.getInstance(member.getProject()).getResolveHelper().isAccessible(member, myPosition, null)) return MyEnum.INACCESSIBLE;
         if (member.isDeprecated()) return MyEnum.DEPRECATED;
       }
index 91c2aa8e5c59fce8e696fcf867f7d25926a38a66..5dcbe17d75798acc64e994b474f4e68724340c37 100644 (file)
@@ -3,6 +3,7 @@ package com.intellij.codeInsight.completion;
 import com.intellij.codeInsight.lookup.DefaultLookupItemRenderer;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementPresentation;
+import com.intellij.featureStatistics.FeatureUsageTracker;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiMember;
 import com.intellij.psi.PsiMethod;
@@ -85,6 +86,8 @@ public class JavaGlobalMemberLookupElement extends LookupElement implements Stat
 
   @Override
   public void handleInsert(InsertionContext context) {
+    FeatureUsageTracker.getInstance().triggerFeatureUsed(JavaCompletionFeatures.GLOBAL_MEMBER_NAME);
+
     (willBeImported() ? myImportInsertion : myQualifiedInsertion).handleInsert(context, this);
   }
 
index c4156d3f4d512bbb1b827ab36f6596c4ae8044e7..424ee4413f72d5aab227c2cd9c7d24297ac61d28 100644 (file)
@@ -31,6 +31,8 @@ import com.intellij.util.Function;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
 import java.util.Collections;
 import java.util.Set;
 
@@ -40,6 +42,7 @@ import java.util.Set;
 public class JavaPsiClassReferenceElement extends LookupItem<Object> {
   public static final ClassConditionKey<JavaPsiClassReferenceElement> CLASS_CONDITION_KEY = ClassConditionKey.create(JavaPsiClassReferenceElement.class);
   private final Object myClass;
+  private volatile Reference<PsiClass> myCache;
   private final String myQualifiedName;
   private String myForcedPresentableName;
 
@@ -82,8 +85,17 @@ public class JavaPsiClassReferenceElement extends LookupItem<Object> {
   @Override
   public PsiClass getObject() {
     if (myClass instanceof PsiAnchor) {
+      Reference<PsiClass> cache = myCache;
+      if (cache != null) {
+        PsiClass psiClass = cache.get();
+        if (psiClass != null) {
+          return psiClass;
+        }
+      }
+
       final PsiClass retrieve = (PsiClass)((PsiAnchor)myClass).retrieve();
       assert retrieve != null : myQualifiedName;
+      myCache = new WeakReference<PsiClass>(retrieve);
       return retrieve;
     }
     return (PsiClass)myClass;
index fc292da6fb7d0efe6e0c0dae53974af0ac0e641a..228c630eda8d0492033c7e00938e0ea49bb2ae43 100644 (file)
@@ -311,9 +311,9 @@ public class JavaSmartCompletionContributor extends CompletionContributor {
     PsiElement position = params.getPosition();
     if (!BasicExpressionCompletionContributor.AFTER_DOT.accepts(position)) {
       for (ExpectedTypeInfo info : mergedInfos) {
-        new JavaMembersGetter(info.getType(), position).addMembers(params, !quick, consumer);
+        new JavaMembersGetter(info.getType(), params).addMembers(!quick, consumer);
         if (!info.getDefaultType().equals(info.getType())) {
-          new JavaMembersGetter(info.getDefaultType(), position).addMembers(params, !quick, consumer);
+          new JavaMembersGetter(info.getDefaultType(), params).addMembers(!quick, consumer);
         }
       }
     }
index 571d7300bb3f06b48cd2bb79a241bbb4631c9762..345e059634002fdba1456bca4991f2a8325b2846 100644 (file)
@@ -18,6 +18,7 @@ package com.intellij.codeInsight.completion;
 import com.intellij.codeInsight.lookup.AutoCompletionPolicy;\r
 import com.intellij.codeInsight.lookup.LookupElement;\r
 import com.intellij.codeInsight.lookup.VariableLookupItem;\r
+import com.intel