Merge remote-tracking branch 'origin/akoshevoy/docker-compose-remote-run'
authorAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Tue, 1 Mar 2016 10:52:12 +0000 (13:52 +0300)
committerAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Tue, 1 Mar 2016 10:52:12 +0000 (13:52 +0300)
859 files changed:
.idea/libraries/Groovy.xml
.idea/libraries/SceneBuilderKit.xml [new file with mode: 0644]
build/scripts/layouts.gant
build/scripts/libLicenses.gant
community-resources/src/idea/IdeaApplicationInfo.xml
java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java
java/debugger/impl/src/com/intellij/debugger/jdi/VirtualMachineProxyImpl.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java
java/idea-ui/src/com/intellij/codeInsight/daemon/impl/LibrarySourceNotificationProvider.kt
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesModifiableModel.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ProjectBytecodeAnalysis.java
java/java-analysis-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspectionBase.java
java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspectionBase.java
java/java-impl/java-impl.iml
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java
java/java-impl/src/com/intellij/codeInsight/editorActions/JavaCopyPasteReferenceProcessor.java
java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java
java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightExceptionsHandler.java
java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightExceptionsHandlerFactory.java
java/java-impl/src/com/intellij/codeInsight/template/macro/MacroUtil.java
java/java-impl/src/com/intellij/psi/filters/getters/JavaMembersGetter.java
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageSearcher.java
java/java-impl/src/com/intellij/refactoring/changeSignature/MethodCallUsageInfo.java
java/java-impl/src/com/intellij/refactoring/changeSignature/MethodReferenceUsageInfo.java [new file with mode: 0644]
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java
java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java
java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java
java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
java/java-impl/src/com/intellij/refactoring/introduceParameter/OldReferenceResolver.java
java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java
java/java-impl/src/com/intellij/refactoring/invertBoolean/JavaInvertBooleanDelegate.java
java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpProcessor.java
java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java [new file with mode: 0644]
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownConflicts.java
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteDelegateImpl.java
java/java-impl/src/com/intellij/refactoring/util/LambdaRefactoringUtil.java
java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceUtil.java
java/java-psi-api/src/com/intellij/psi/util/RedundantCastUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSessionContainer.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/PsiGraphInferenceHelper.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
java/java-psi-impl/src/messages/JavaErrorMessages.properties
java/java-tests/testData/codeInsight/completion/smartType/UseObjectConstantsFromTargetClass-out.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/completion/smartType/UseObjectConstantsFromTargetClass.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/completion/smartTypeSorting/GetWildcardFactoryLogger.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/InvalidExpressions.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/MethodCannotBeApplied.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA114894.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA125031.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57508.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA59283.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEADEV57343.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/InferenceWithUpperBoundPromotion.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/Variance.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA152179.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/Variance.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/completion/normal/UnexpectedLambdaInAmbiguousCall.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/OuterCallOverloads.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/VariableNamesOfNestedCalls.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/interfaceMethods/DefaultMethodOverrideAbstract.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/CaptureTypeOfNewArrayExpression.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/redundantCast/AnotherInterfaceMethodIsPointed.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/redundantCast/Ser.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/redundantCast/SerializableLambda.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterCodeBlockLambda.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterDependencyOnQualifiedFieldOfTheSameClass.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeDependencyOnQualifiedFieldOfTheSameClass.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeNewOperatorType/afterCantCollapseDiamonds.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/afterSetterAfterSuperConstructorCall.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/beforeSetterAfterSuperConstructorCall.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/after4.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/before4.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/before6.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/beforeOverloadContainingMethods.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/beforeOverloadContainingMethods1.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn8/beforeJdkClass.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantTypeArgs/beforeOverloads.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCompactFilterToMethodReference.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCompactFilterToMethodReference.java [new file with mode: 0644]
java/java-tests/testData/refactoring/changeSignature/ExpandMethodReferenceToDeleteParameter.java [new file with mode: 0644]
java/java-tests/testData/refactoring/changeSignature/ExpandMethodReferenceToDeleteParameter_after.java [new file with mode: 0644]
java/java-tests/testData/refactoring/changeSignature/RenameMethodUsedInMethodReference.java [new file with mode: 0644]
java/java-tests/testData/refactoring/changeSignature/RenameMethodUsedInMethodReference_after.java [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject/WithPrivateStaticMethodUsed.java [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject/WithPrivateStaticMethodUsed.java.after [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject/WithPrivateStaticMethodUsed2.java [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject/WithPrivateStaticMethodUsed2.java.after [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/MultilineDeclarationsWithReturn.java [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject/multipleExitPoints/MultilineDeclarationsWithReturn.java.after [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject4Debugger/ThisAndSuperReferences.java [new file with mode: 0644]
java/java-tests/testData/refactoring/inlineLocal/LocalVarUsedInLambdaBody.java [new file with mode: 0644]
java/java-tests/testData/refactoring/inlineLocal/LocalVarUsedInLambdaBody.java.after [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameter/afterBareRefToVararg.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameter/afterExpandMethodReference.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameter/afterNewWithRefToVararg.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameter/beforeBareRefToVararg.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameter/beforeExpandMethodReference.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameter/beforeNewWithRefToVararg.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameterObject/existingWithAnotherFieldNames/after/Param.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameterObject/existingWithAnotherFieldNames/after/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameterObject/existingWithAnotherFieldNames/before/Param.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameterObject/existingWithAnotherFieldNames/before/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/invertBoolean/methodRefs.conflicts.txt
java/java-tests/testData/refactoring/renameInplace/ClassWithConstructorReferenceInside.java [new file with mode: 0644]
java/java-tests/testData/refactoring/renameInplace/ClassWithConstructorReferenceInside_after.java [new file with mode: 0644]
java/java-tests/testData/refactoring/safeDelete/ParameterInMethodUsedInMethodReference.java [new file with mode: 0644]
java/java-tests/testData/refactoring/safeDelete/ParameterInMethodUsedInMethodReference_after.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/codeInsight/completion/JavadocCompletionTest.groovy
java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal8CompletionTest.groovy
java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.groovy
java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Interface8MethodsHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Simplify2DiamondInspectionsTest.java
java/java-tests/testSrc/com/intellij/codeInsight/highlighting/HighlightUsagesHandlerTest.groovy
java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy
java/java-tests/testSrc/com/intellij/codeInspection/OfflineIRVTest.java
java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexRestoreTest.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java
java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTest.java
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java
java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterObjectTest.java
java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java
java/java-tests/testSrc/com/intellij/refactoring/PushDownMultifileTest.java
java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java
java/java-tests/testSrc/com/intellij/refactoring/RenameMembersInplaceTest.java
java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java
java/openapi/src/com/intellij/refactoring/PackageWrapper.java
jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java
json/src/com/intellij/json/psi/impl/JSStringLiteralEscaper.java
json/src/com/jetbrains/jsonSchema/extension/JsonSchemaImportedProviderFactory.java
json/src/com/jetbrains/jsonSchema/extension/JsonSchemaProjectSelfProviderFactory.java [new file with mode: 0644]
json/src/com/jetbrains/jsonSchema/extension/JsonSchemaProviderFactory.java
json/src/com/jetbrains/jsonSchema/extension/JsonSchemaSelfProviderFactory.java
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaConflictNotificationProvider.java
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaReader.java
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java
json/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java
json/tests/testData/jsonSchema/WithWrongItems.json [new file with mode: 0644]
json/tests/testData/jsonSchema/WithWrongRequired.json [new file with mode: 0644]
lib/groovy-all-2.4.6.jar [moved from lib/groovy-all-2.3.9.jar with 50% similarity]
lib/required_for_dist.txt
lib/src/groovy-all-2.3.9-sources.jar [deleted file]
lib/src/groovy-all-2.4.6-sources.jar [new file with mode: 0644]
platform/analysis-api/src/com/intellij/codeInsight/intention/impl/PriorityActionWrapper.java
platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
platform/boot/src/com/intellij/lang/properties/charset/Native2AsciiCharsetProvider.java
platform/configuration-store-impl/src/DirectoryBasedStorage.kt
platform/configuration-store-impl/src/ProjectStateStorageManager.kt
platform/configuration-store-impl/src/StateStorageManagerImpl.kt
platform/core-api/src/com/intellij/openapi/application/TransactionGuard.java [new file with mode: 0644]
platform/core-api/src/com/intellij/openapi/editor/colors/TextAttributesKey.java
platform/core-api/src/com/intellij/openapi/startup/StartupManager.java
platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java
platform/core-api/src/com/intellij/psi/util/PsiCacheKey.java
platform/core-api/src/com/intellij/ui/SimpleTextAttributes.java
platform/core-impl/core-impl.iml
platform/core-impl/src/com/intellij/core/MockDocumentCommitProcessor.java
platform/core-impl/src/com/intellij/diagnostic/PerformanceWatcher.java
platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java [new file with mode: 0644]
platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java
platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java
platform/core-impl/src/com/intellij/openapi/progress/util/AbstractProgressIndicatorBase.java
platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
platform/core-impl/src/com/intellij/psi/impl/DocumentCommitProcessor.java
platform/core-impl/src/com/intellij/psi/impl/DocumentCommitThread.java
platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
platform/core-impl/src/com/intellij/psi/impl/file/PsiDirectoryImpl.java
platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java
platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
platform/diff-impl/src/com/intellij/diff/requests/UnknownFileTypeDiffRequest.java
platform/diff-impl/src/com/intellij/diff/tools/binary/OnesideBinaryDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/binary/ThreesideBinaryDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/binary/TwosideBinaryDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java
platform/diff-impl/src/com/intellij/diff/tools/holders/BinaryEditorHolder.java
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatus.java
platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java
platform/icons/src/general/recursive.png [new file with mode: 0644]
platform/icons/src/general/recursive@2x.png [new file with mode: 0644]
platform/icons/src/general/recursive@2x_dark.png [new file with mode: 0644]
platform/icons/src/general/recursive_dark.png [new file with mode: 0644]
platform/icons/src/ide/notification/collapse.png
platform/lang-api/src/com/intellij/codeInspection/offline/OfflineProblemDescriptor.java
platform/lang-api/src/com/intellij/execution/runners/AsyncGenericProgramRunner.java
platform/lang-api/src/com/intellij/find/FindManager.java
platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java
platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtil.java
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DefaultHighlightInfoProcessor.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/QuickDocOnMouseOverManager.java
platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
platform/lang-impl/src/com/intellij/codeInsight/hint/ShowParameterInfoContext.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/NextVariableAction.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/PreviousVariableAction.java
platform/lang-impl/src/com/intellij/codeInspection/actions/ViewOfflineResultsAction.java
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProvider.java
platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProviderImpl.java
platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineInspectionRVContentProvider.java
platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java
platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineRefElementNode.java
platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionGroupNode.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionModuleNode.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNode.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNodeInfo.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionRootNode.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeNode.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeUpdater.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java
platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixToolbar.java
platform/lang-impl/src/com/intellij/codeInspection/ui/RefElementNode.java
platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java
platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiImpl.java
platform/lang-impl/src/com/intellij/find/SearchTextArea.java
platform/lang-impl/src/com/intellij/find/actions/CompositeActiveComponent.java
platform/lang-impl/src/com/intellij/find/actions/FindUsagesInFileAction.java
platform/lang-impl/src/com/intellij/find/findInProject/FindInProjectManager.java
platform/lang-impl/src/com/intellij/find/impl/FindDialog.java
platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java
platform/lang-impl/src/com/intellij/ide/scratch/ScratchResolveScopeEnlarger.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserUtils.java
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/PsiAwareTextEditorProvider.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/InspectionsConfigTreeTable.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/ThreeStateCheckBoxRenderer.java
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java
platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java
platform/lang-impl/src/com/intellij/refactoring/memberPushDown/AbstractPushDownProcessor.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/refactoring/memberPushDown/NewSubClassData.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownData.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownDelegate.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownUsageViewDescriptor.java [moved from java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownUsageViewDescriptor.java with 52% similarity]
platform/lang-impl/src/com/intellij/util/indexing/MapIndexStorage.java
platform/lang-impl/src/com/intellij/util/indexing/MapReduceIndex.java
platform/lang-impl/src/com/intellij/util/indexing/UpdatableIndex.java
platform/platform-api/src/com/intellij/notification/NotificationGroup.java
platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java
platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java
platform/platform-api/src/com/intellij/openapi/ui/ComboBoxWithWidePopup.java
platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
platform/platform-api/src/com/intellij/openapi/ui/StripeTable.java
platform/platform-api/src/com/intellij/openapi/ui/ThreeComponentsSplitter.java
platform/platform-api/src/com/intellij/ui/BooleanTableCellEditor.java
platform/platform-api/src/com/intellij/ui/CheckboxTreeHelper.java
platform/platform-api/src/com/intellij/ui/ScreenUtil.java
platform/platform-api/src/com/intellij/ui/components/DefaultScrollBarUI.java
platform/platform-api/src/com/intellij/ui/components/JBScrollBar.java
platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java
platform/platform-api/src/com/intellij/ui/treeStructure/treetable/TreeTableTree.java
platform/platform-api/src/com/intellij/util/ui/RegionPainter.java
platform/platform-api/src/com/intellij/util/ui/StatusText.java
platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java
platform/platform-impl/src/com/intellij/designer/LightToolWindowManager.java
platform/platform-impl/src/com/intellij/diagnostic/OutOfMemoryDialog.java
platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
platform/platform-impl/src/com/intellij/ide/SaveAndSyncHandlerImpl.java
platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java
platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java
platform/platform-impl/src/com/intellij/ide/plugins/InstallPluginAction.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginTableModel.java
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaScrollBarUI.java
platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
platform/platform-impl/src/com/intellij/notification/impl/NotificationGroupBean.java [moved from platform/script-debugger/backend/src/WorkerManager.kt with 59% similarity]
platform/platform-impl/src/com/intellij/notification/impl/NotificationParentGroup.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/notification/impl/NotificationParentGroupBean.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsConfigurablePanel.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButtonWithText.java
platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/IterationState.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/LineLayout.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsTreeView.java
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java
platform/platform-impl/src/com/intellij/openapi/vcs/impl/FileStatusManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/CanonicalPathMap.java
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshSessionImpl.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/VfsImplUtil.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
platform/platform-impl/src/com/intellij/ui/CardLayoutPanel.java
platform/platform-impl/src/com/intellij/ui/content/tabs/PinToolwindowTabAction.java
platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java
platform/platform-impl/src/com/intellij/util/ContentUtilEx.java
platform/platform-impl/src/com/intellij/util/containers/util.kt
platform/platform-impl/src/org/jetbrains/io/netty.kt
platform/platform-resources-en/src/messages/ActionsBundle.properties
platform/platform-resources-en/src/messages/FindBundle.properties
platform/platform-resources-en/src/messages/InspectionsBundle.properties
platform/platform-resources-en/src/messages/RefactoringBundle.properties
platform/platform-resources-en/src/messages/UIBundle.properties
platform/platform-resources-en/src/messages/VcsBundle.properties
platform/platform-resources/src/META-INF/JsonPlugin.xml
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
platform/platform-resources/src/META-INF/PlatformExtensions.xml
platform/platform-resources/src/idea/Keymap_Xcode.xml
platform/platform-resources/src/idea/PlatformActions.xml
platform/platform-resources/src/idea/VcsActions.xml
platform/platform-resources/src/launcher.py
platform/platform-tests/testData/editor/painting/_fontBold.png [new file with mode: 0644]
platform/platform-tests/testData/editor/painting/eraseMarker.png [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorPaintingTest.java
platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImplTest.java
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorRtlTest.java
platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java [deleted file]
platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.kt [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/util/concurrency/AppScheduledExecutorServiceTest.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleLibraryTable.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryTableBase.java
platform/projectModel-impl/src/com/intellij/project/model/impl/library/JpsLibraryTableImpl.java
platform/projectModel-impl/src/messages/ProjectBundle.properties
platform/script-debugger/backend/src/Breakpoint.kt
platform/script-debugger/backend/src/BreakpointBase.kt
platform/script-debugger/backend/src/ScriptBase.kt
platform/script-debugger/backend/src/ScriptManagerBaseEx.kt [moved from platform/script-debugger/backend/src/org/jetbrains/debugger/ScriptManagerBaseEx.kt with 97% similarity]
platform/script-debugger/backend/src/ScriptRegExpBreakpointTarget.kt [moved from platform/script-debugger/backend/src/org/jetbrains/debugger/ScriptRegExpBreakpointTarget.kt with 55% similarity]
platform/script-debugger/backend/src/StandaloneVmHelper.kt
platform/script-debugger/backend/src/SuspendContext.kt
platform/script-debugger/backend/src/SuspendContextBase.kt
platform/script-debugger/backend/src/SuspendContextManager.kt
platform/script-debugger/backend/src/SuspendContextManagerBase.kt
platform/script-debugger/backend/src/Vm.kt
platform/script-debugger/backend/src/VmBase.kt
platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventListener.java
platform/script-debugger/backend/src/org/jetbrains/debugger/values/ValueManager.kt
platform/script-debugger/backend/src/util.kt
platform/script-debugger/debugger-ui/src/BasicDebuggerViewSupport.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/BasicDebuggerViewSupport.kt with 97% similarity]
platform/script-debugger/debugger-ui/src/CallFrameView.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/CallFrameView.kt with 98% similarity]
platform/script-debugger/debugger-ui/src/DebugProcessImpl.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.kt with 67% similarity]
platform/script-debugger/debugger-ui/src/DebuggerViewSupport.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebuggerViewSupport.kt with 98% similarity]
platform/script-debugger/debugger-ui/src/FunctionScopesValueGroup.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/FunctionScopesValueGroup.kt with 97% similarity]
platform/script-debugger/debugger-ui/src/LineBreakpointManager.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/LineBreakpointManager.kt with 68% similarity]
platform/script-debugger/debugger-ui/src/MemberFilter.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/MemberFilter.kt with 95% similarity]
platform/script-debugger/debugger-ui/src/MemberFilterWithNameMappings.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/MemberFilterWithNameMappings.kt with 100% similarity]
platform/script-debugger/debugger-ui/src/ProcessHandlerWrapper.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/ProcessHandlerWrapper.kt with 98% similarity]
platform/script-debugger/debugger-ui/src/RemoteVmConnection.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/connection/RemoteVmConnection.kt with 82% similarity]
platform/script-debugger/debugger-ui/src/ScopeVariablesGroup.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/ScopeVariablesGroup.kt with 98% similarity]
platform/script-debugger/debugger-ui/src/SourceInfo.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/SourceInfo.kt with 100% similarity]
platform/script-debugger/debugger-ui/src/SuspendContextBase.kt [new file with mode: 0644]
platform/script-debugger/debugger-ui/src/VariableView.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/VariableView.kt with 100% similarity]
platform/script-debugger/debugger-ui/src/Variables.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/Variables.kt with 100% similarity]
platform/script-debugger/debugger-ui/src/VmConnection.kt [moved from platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/connection/VmConnection.kt with 98% similarity]
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java
platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
platform/testFramework/src/com/intellij/testFramework/ThreadTracker.java
platform/testFramework/src/com/intellij/testFramework/VfsTestUtil.java
platform/testFramework/src/com/intellij/testFramework/fixtures/BareTestFixtureTestCase.java
platform/testFramework/src/com/intellij/testFramework/rules/TempDirectory.java
platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java
platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java
platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
platform/util/resources/misc/registry.properties
platform/util/src/com/intellij/icons/AllIcons.java
platform/util/src/com/intellij/openapi/application/AccessToken.java
platform/util/src/com/intellij/openapi/util/ShutDownTracker.java
platform/util/src/com/intellij/ui/CaptionPanel.java
platform/util/src/com/intellij/ui/HeldDownKeyListener.java [new file with mode: 0644]
platform/util/src/com/intellij/util/concurrency/AppScheduledExecutorService.java
platform/util/src/com/intellij/util/concurrency/Futures.java [deleted file]
platform/util/src/com/intellij/util/concurrency/Semaphore.java
platform/util/src/com/intellij/util/containers/BiDirectionalEnumerator.java [new file with mode: 0644]
platform/util/src/com/intellij/util/containers/ContainerUtil.java
platform/util/src/com/intellij/util/containers/FixedHashMap.java [new file with mode: 0644]
platform/util/src/com/intellij/util/diff/Diff.java
platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java
platform/util/src/com/intellij/util/text/DateFormatUtil.java
platform/util/src/com/intellij/util/ui/UIUtil.java
platform/util/src/com/intellij/util/ui/tree/WideSelectionTreeUI.java
platform/vcs-api/src/com/intellij/openapi/vcs/vfs/ContentRevisionVirtualFile.java
platform/vcs-api/src/com/intellij/openapi/vcs/vfs/VcsVirtualFile.java
platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateVcsVirtualFileAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangeListRenderer.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CleanUnshelvedAction.java [new file with mode: 0644]
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CleanUnshelvedFilterDialog.java [new file with mode: 0644]
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DeleteAlreadyUnshelvedAction.java [deleted file]
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTracker.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsFileStatusProvider.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogDataPack.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogProvider.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogRefs.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogSettings.java
platform/vcs-log/graph-api/src/com/intellij/vcs/log/graph/actions/GraphAnswer.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/api/permanent/PermanentGraphInfo.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/BranchFilterController.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedActionManager.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/collapsing/CollapsedController.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/BaseController.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/BekBaseController.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/LinearGraphController.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PrintElementManagerImpl.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/ReachableNodes.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/SimpleGraphInfo.java [new file with mode: 0644]
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/VisibleGraphImpl.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/permanent/GraphLayoutImpl.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/permanent/PermanentCommitsInfoImpl.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/ColorGetterByLayoutIndex.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/utils/LinearGraphUtils.java
platform/vcs-log/graph/test/com/intellij/vcs/log/graph/TestGraphBuilder.kt
platform/vcs-log/impl/src/META-INF/vcs-log.xml
platform/vcs-log/impl/src/com/intellij/vcs/log/VcsLogHashMap.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/AbstractDataGetter.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/ContainingBranchesGetter.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataGetter.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataPack.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataPackBase.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataPackChangeListener.java [moved from platform/script-debugger/backend/src/WorkerManagerBase.kt with 63% similarity]
platform/vcs-log/impl/src/com/intellij/vcs/log/data/EmptyVisibleGraph.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/FakeVisiblePackBuilder.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/data/InMemoryHashMap.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/data/LoadingDetails.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogDataManager.java [moved from platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogDataHolder.java with 72% similarity]
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFilterer.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFiltererImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogHashMapImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogTabsProperties.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogUiProperties.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogUiPropertiesDeprecated.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogUiPropertiesImpl.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VisiblePack.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VisiblePackBuilder.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VisiblePackChangeListener.java [moved from platform/script-debugger/backend/src/org/jetbrains/debugger/WebWorker.kt with 76% similarity]
platform/vcs-log/impl/src/com/intellij/vcs/log/graph/GraphColorManagerImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogContentProvider.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogObjectsFactoryImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogSettingsImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogTabsRefresher.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogUtil.java
platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogRepoSizeCollector.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/CurrentBranchHighlighter.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MyCommitsHighlighter.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogActionPlaces.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogHighlighterFactory.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/CloseLogTabAction.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/OpenAnotherLogTabAction.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/RefreshLogAction.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchPopupBuilder.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/UserFilterPopupComponent.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/GraphCommitCellRender.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/GraphTableModel.java
platform/vcs-log/impl/test/com/intellij/vcs/log/data/VcsLogRefresherTest.java
platform/vcs-log/impl/test/com/intellij/vcs/log/data/VisiblePackBuilderTest.kt
platform/vcs-log/impl/test/com/intellij/vcs/log/impl/TestVcsLogProvider.java
platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSessionAdapter.java
platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSessionListener.java
platform/xdebugger-api/src/com/intellij/xdebugger/frame/XSuspendContext.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/WatchInplaceEditor.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugViewSessionListener.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XInspectDialog.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/OptionalGetWithoutIsPresentInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/InterfaceMayBeAnnotatedFunctionalInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneCallsSuperCloneInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/PointlessNullCheckInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/finalization/FinalizeCallsSuperFinalizeInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/SuperTearDownInFinallyInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TeardownCallsSuperTeardownInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableAccessUtils.java
plugins/InspectionGadgets/src/com/intellij/codeInspection/TrivialFunctionalExpressionUsageInspection.java
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/optional_get_without_is_present/OptionalGetWithoutIsPresent.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/pointless_null_check/PointlessNullCheck.java
plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/pointless_null_check/expected.xml [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/finalization/finalize_calls_super_finalize/FinalizeCallsSuperFinalize.java
plugins/InspectionGadgets/test/com/siyeh/igtest/inheritance/redundant_method_override/RedundantMethodOverride.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/OptionalGetWithoutIsPresentInspectionTest.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/PointlessNullCheckInspectionTest.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceMethodRefWithLambdaIntention.java
plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/Ambiguity_after.java
plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/StaticMethodRef_after.java
plugins/cucumber-jvm-formatter/src/org/jetbrains/plugins/cucumber/java/run/CucumberJvmSMFormatter.java
plugins/devkit/resources/META-INF/plugin.xml
plugins/devkit/resources/inspectionDescriptions/StubBasedPsiElementBaseGetParent.html [new file with mode: 0644]
plugins/devkit/src/DevKitUseScopeEnlarger.java
plugins/devkit/src/inspections/StatefulEpInspection.java
plugins/devkit/src/inspections/StubBasedPsiElementBaseGetParentInspection.java [new file with mode: 0644]
plugins/devkit/testSources/inspections/StubBasedPsiElementBaseGetParentInspectionTest.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/GitUtil.java
plugins/git4idea/src/git4idea/branch/DeepComparator.java
plugins/git4idea/src/git4idea/branch/GitBranchUtil.java
plugins/git4idea/src/git4idea/branch/GitBranchWorker.java
plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
plugins/git4idea/src/git4idea/log/GitLogProvider.java
plugins/git4idea/src/git4idea/log/GitRefManager.java
plugins/git4idea/src/git4idea/log/GitShowCommitInLogAction.java
plugins/git4idea/src/git4idea/log/GitShowExternalLogAction.java
plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
plugins/git4idea/src/git4idea/merge/GitMergeUtil.java
plugins/git4idea/src/git4idea/merge/GitMerger.java
plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java
plugins/git4idea/src/git4idea/push/GitPushSpecParser.java
plugins/git4idea/src/git4idea/rebase/GitRebaseDialog.java
plugins/git4idea/src/git4idea/rebase/GitRebaseProcess.java
plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java
plugins/git4idea/src/git4idea/rebase/GitRebaser.java
plugins/git4idea/src/git4idea/repo/GitRepository.java
plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java
plugins/git4idea/src/git4idea/repo/GitRepositoryReader.java
plugins/git4idea/src/git4idea/repo/GitRepositoryUpdater.java
plugins/git4idea/src/git4idea/repo/GitUntrackedFilesHolder.java
plugins/git4idea/src/git4idea/stash/GitShelveChangesSaver.java
plugins/git4idea/src/git4idea/stash/GitShelveUtils.java
plugins/git4idea/src/git4idea/ui/GitTagDialog.java
plugins/git4idea/src/git4idea/ui/branch/GitLogBranchOperationsActionGroup.java
plugins/git4idea/src/git4idea/update/GitFetcher.java
plugins/git4idea/tests/git4idea/repo/GitBareWorkTreeTest.kt [new file with mode: 0644]
plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderNewTest.java
plugins/git4idea/tests/git4idea/repo/GitStandardWorkTreeTest.kt [moved from plugins/git4idea/tests/git4idea/repo/GitWorkTreeTest.kt with 64% similarity]
plugins/git4idea/tests/git4idea/repo/GitWorkTreeBaseTest.kt [new file with mode: 0644]
plugins/git4idea/tests/git4idea/test/GitTestUtil.java
plugins/git4idea/tests/git4idea/test/MockGitRepository.java
plugins/gradle/src/org/jetbrains/plugins/gradle/projectView/GradleTreeStructureProvider.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/GroovyChangeUtilSupport.java
plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java
plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionConfidence.java
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyDebuggerTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/DsldTest.groovy
plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryUpdater.java
plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java
plugins/hg4idea/testSrc/hg4idea/test/config/HgConfigTest.java
plugins/hg4idea/testSrc/hg4idea/test/history/HgAnnotationTest.java
plugins/hg4idea/testSrc/hg4idea/test/history/HgHistoryTest.java
plugins/hg4idea/testSrc/hg4idea/test/mq/MqPatchTest.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/code/CodeConstants.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/StructClass.java
plugins/java-decompiler/plugin/test/org/jetbrains/java/decompiler/IdeaDecompilerTest.kt
plugins/javaFX/FxBuilderEmbedder/FxBuilderEmbedder.iml [deleted file]
plugins/javaFX/FxBuilderEmbedder/lib/embedder.jar [deleted file]
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java
plugins/javaFX/javaFX.iml
plugins/javaFX/lib/SceneBuilderKit-8.1.1.jar [new file with mode: 0644]
plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxMainMethodRunConfigurationProvider.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxGetterSetterPrototypeProvider.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxCommonNames.java [moved from plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxCommonClassNames.java with 97% similarity]
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxNamespaceDescriptor.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxUnresolvedFxIdReferenceInspection.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyAttributeDescriptor.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyElementDescriptor.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxColorReference.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxColorReferenceProvider.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxComponentIdReferenceProvider.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxReferencesContributor.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/ErrorSceneBuilderCreator.java [deleted file]
plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderCreator.java [deleted file]
plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderCreatorImpl.java [deleted file]
plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditorProvider.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java [moved from plugins/javaFX/FxBuilderEmbedder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java with 79% similarity]
plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderKitWrapper.java [moved from plugins/javaFX/FxBuilderEmbedder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderKitWrapper.java with 65% similarity]
plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderProvider.java [deleted file]
plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/State.java [deleted file]
plugins/javaFX/testData/completion/variableCompletionBooleanFirst.fxml [new file with mode: 0644]
plugins/javaFX/testData/completion/variableCompletionTooltipFirst.fxml [new file with mode: 0644]
plugins/javaFX/testData/highlighting/ControllerInExpression.java [new file with mode: 0644]
plugins/javaFX/testData/highlighting/ControllerInExpressionWrapper.java [new file with mode: 0644]
plugins/javaFX/testData/highlighting/controllerInExpression.fxml [new file with mode: 0644]
plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/server/MavenServerUtil.java
plugins/properties/properties-psi-api/properties-psi-api.iml
plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesFileType.java
plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/psi/impl/PropertyImpl.java
plugins/properties/properties.iml
plugins/svn4idea/src/org/jetbrains/idea/svn/history/LogEntry.java
plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnChangeList.java
plugins/tasks/tasks-api/src/com/intellij/tasks/ui/TaskDialogPanel.java [new file with mode: 0644]
plugins/tasks/tasks-api/src/com/intellij/tasks/ui/TaskDialogPanelProvider.java [new file with mode: 0644]
plugins/tasks/tasks-core/src/META-INF/plugin.xml
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskAction.java
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskDialog.form
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskDialog.java
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.form
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/vcs/VcsCloseTaskPanel.form [new file with mode: 0644]
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/vcs/VcsCloseTaskPanel.java [new file with mode: 0644]
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/vcs/VcsOpenTaskPanel.form [new file with mode: 0644]
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/vcs/VcsOpenTaskPanel.java [new file with mode: 0644]
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/vcs/VcsTaskDialogPanelProvider.java [new file with mode: 0644]
plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java
plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormNode.java
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltDebugProcess.java
plugins/yaml/testSrc/org/jetbrains/yaml/scalarConversion/YAMLScalarConversionTest.java
python/educational-core/course-creator/resources/META-INF/plugin.xml
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCFileDeletedListener.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonRenameHandler.java [new file with mode: 0644]
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectService.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRefactoringElementListenerProvider.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameHandler.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameInputValidator.java [deleted file]
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskRenameHandler.java [new file with mode: 0644]
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTaskFile.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCFromCourseArchive.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowPreview.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCStudentInvisibleFileNode.java [new file with mode: 0644]
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCTreeStructureProvider.java
python/educational-core/src/com/jetbrains/edu/EduUtils.java
python/educational-core/src/com/jetbrains/edu/courseFormat/AnswerPlaceholder.java
python/educational-core/src/com/jetbrains/edu/stepic/EduStepicConnector.java
python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyJavaFxToolWindow.java
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudySwingToolWindow.java
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java
python/educational-python/course-creator-python/resources/fileTemplates/internal/task.py.ft [moved from python/educational-python/course-creator-python/resources/fileTemplates/internal/task.answer.py.ft with 100% similarity]
python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java
python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/actions/PyCCRunTestsAction.java
python/helpers/pycharm/pycharm_load_entry_point.py
python/helpers/pydev/_pydevd_bundle/pydevd_comm.py
python/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_32.pyd
python/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_64.pyd
python/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_34_32.pyd
python/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_34_64.pyd
python/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_35_32.cp35-win32.pyd
python/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_35_64.cp35-win_amd64.pyd
python/helpers/pydev/_pydevd_bundle/pydevd_frame.py
python/helpers/pydev/_pydevd_bundle/pydevd_signature.py
python/helpers/pydev/build.gradle
python/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
python/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
python/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
python/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
python/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
python/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
python/helpers/pydev/pydevd_attach_to_process/dll/attach.cpp
python/helpers/pydev/pydevd_attach_to_process/linux/attach_linux.c
python/helpers/pydev/pydevd_attach_to_process/linux/compile_mac.sh
python/ipnb/lib/batik.jar [deleted file]
python/ipnb/lib/jeuclid-core-3.1.9.jar [deleted file]
python/ipnb/lib/snuggletex-core-1.3-SNAPSHOT.jar [deleted file]
python/ipnb/lib/xmlgraphics-commons-1.3.1.jar [deleted file]
python/ipnb/resources/META-INF/ipython-notebook.xml
python/ipnb/resources/fileTemplates/internal/IPython Notebook.ipynb.ft [new file with mode: 0644]
python/ipnb/resources/org/jetbrains/plugins/ipnb/math-characters.txt [deleted file]
python/ipnb/resources/style/javaFXBrowserDarcula.css [new file with mode: 0644]
python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbFileType.java
python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbUtils.java
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.form
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/IpnbFileEditor.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbCodeCellAction.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbCreateFileAction.java [new file with mode: 0644]
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbHeadingCellActionBase.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbMarkdownCellAction.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunAllCellsAction.java [new file with mode: 0644]
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunCellAction.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunCellBaseAction.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunCellInplaceAction.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbFilePanel.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbHeadingPanel.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbMarkdownPanel.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbTexPackageDefinitions.java [deleted file]
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbCodeOutputPanel.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbCodePanel.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbErrorPanel.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbHtmlPanel.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbImagePanel.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbLatexPanel.java
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbStreamPanel.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/IpnbFile.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/IpnbParser.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/IpnbCodeCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/IpnbEditableCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/IpnbHeadingCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/IpnbMarkdownCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/output/IpnbErrorOutputCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/output/IpnbHtmlOutputCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/output/IpnbImageOutputCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/output/IpnbJpegOutputCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/output/IpnbLatexOutputCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/output/IpnbOutOutputCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/output/IpnbOutputCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/output/IpnbPngOutputCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/output/IpnbStreamOutputCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/format/cells/output/IpnbSvgOutputCell.java
python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java
python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyFragment.java
python/pydevSrc/com/jetbrains/python/debugger/PySignature.java
python/pydevSrc/com/jetbrains/python/debugger/pydev/AbstractCommand.java
python/pydevSrc/com/jetbrains/python/debugger/pydev/ProtocolParser.java
python/resources/inspectionDescriptions/PyMissingTypeHintsInspection.html [new file with mode: 0644]
python/resources/intentionDescriptions/PyAnnotateTypesIntention/after.html.template [new file with mode: 0644]
python/resources/intentionDescriptions/PyAnnotateTypesIntention/before.html.template [new file with mode: 0644]
python/resources/intentionDescriptions/PyAnnotateTypesIntention/description.html [new file with mode: 0644]
python/src/META-INF/python-core-common.xml
python/src/com/jetbrains/python/PyBundle.properties
python/src/com/jetbrains/python/codeInsight/intentions/PyAnnotateTypesIntention.java [new file with mode: 0644]
python/src/com/jetbrains/python/codeInsight/intentions/SpecifyTypeInDocstringIntention.java
python/src/com/jetbrains/python/codeInsight/intentions/SpecifyTypeInPy3AnnotationsIntention.java
python/src/com/jetbrains/python/codeInsight/intentions/TypeIntention.java
python/src/com/jetbrains/python/debugger/PyCallSignatureTypeProvider.java
python/src/com/jetbrains/python/debugger/PyRunCythonExtensionsFilter.java
python/src/com/jetbrains/python/debugger/PySignatureCacheManagerImpl.java
python/src/com/jetbrains/python/debugger/PySuspendContext.java
python/src/com/jetbrains/python/documentation/docstrings/PyDocstringGenerator.java
python/src/com/jetbrains/python/inspections/PyMissingTypeHintsInspection.java [new file with mode: 0644]
python/src/com/jetbrains/python/inspections/PyProtectedMemberInspection.java
python/src/com/jetbrains/python/inspections/quickfix/DocstringQuickFix.java
python/src/com/jetbrains/python/inspections/quickfix/PyImplementMethodsQuickFix.java
python/src/com/jetbrains/python/inspections/quickfix/PyQuickFixUtil.java [new file with mode: 0644]
python/src/com/jetbrains/python/psi/types/PyDynamicallyEvaluatedType.java
python/src/com/jetbrains/python/refactoring/classes/pushDown/PyPushDownProcessor.java
python/src/com/jetbrains/python/run/AbstractPythonRunConfiguration.java
python/src/com/jetbrains/python/run/PyRunConfigurationEditorExtension.java [new file with mode: 0644]
python/src/com/jetbrains/python/run/PythonExtendedConfigurationEditor.java [new file with mode: 0644]
python/src/com/jetbrains/python/sdk/PythonSdkType.java
python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
python/testData/debug/test_multithread.py
python/testData/debug/test_my_code.py
python/testData/dynamicTypes/1.py [new file with mode: 0644]
python/testData/dynamicTypes/1_after.py [new file with mode: 0644]
python/testData/inspections/PyMissingTypeHintsInspection/noAnnotations.py [new file with mode: 0644]
python/testData/inspections/PyMissingTypeHintsInspection/py3kAnnotations.py [new file with mode: 0644]
python/testData/inspections/PyMissingTypeHintsInspection/typeComment.py [new file with mode: 0644]
python/testData/inspections/PyMissingTypeHintsInspection/typeCommentOnTheSameLine.py [new file with mode: 0644]
python/testData/intentions/PyAnnotateTypesIntentionTest/caretOnDefinition.py [new file with mode: 0644]
python/testData/intentions/PyAnnotateTypesIntentionTest/caretOnDefinition_after.py [new file with mode: 0644]
python/testData/intentions/PyAnnotateTypesIntentionTest/caretOnImportedInvocation.py [new file with mode: 0644]
python/testData/intentions/PyAnnotateTypesIntentionTest/caretOnImportedInvocation_after.py [new file with mode: 0644]
python/testData/intentions/PyAnnotateTypesIntentionTest/caretOnInvocation.py [new file with mode: 0644]
python/testData/intentions/PyAnnotateTypesIntentionTest/caretOnInvocation_after.py [new file with mode: 0644]
python/testData/intentions/PyAnnotateTypesIntentionTest/foo_decl.py [new file with mode: 0644]
python/testData/intentions/PyAnnotateTypesIntentionTest/foo_decl_after.py [new file with mode: 0644]
python/testData/intentions/PyAnnotateTypesIntentionTest/typeComment.py [new file with mode: 0644]
python/testData/intentions/PyAnnotateTypesIntentionTest/typeComment_after.py [new file with mode: 0644]
python/testData/intentions/SpecifyTypeInPy3AnnotationsIntentionTest/caretOnDefinition.py [new file with mode: 0644]
python/testData/intentions/SpecifyTypeInPy3AnnotationsIntentionTest/caretOnDefinition_after.py [new file with mode: 0644]
python/testData/intentions/SpecifyTypeInPy3AnnotationsIntentionTest/caretOnImportedInvocation.py [new file with mode: 0644]
python/testData/intentions/SpecifyTypeInPy3AnnotationsIntentionTest/caretOnImportedInvocation_after.py [new file with mode: 0644]
python/testData/intentions/SpecifyTypeInPy3AnnotationsIntentionTest/caretOnInvocation.py [new file with mode: 0644]
python/testData/intentions/SpecifyTypeInPy3AnnotationsIntentionTest/caretOnInvocation_after.py [new file with mode: 0644]
python/testData/intentions/SpecifyTypeInPy3AnnotationsIntentionTest/caretOnParamUsage.py [new file with mode: 0644]
python/testData/intentions/SpecifyTypeInPy3AnnotationsIntentionTest/caretOnParamUsage_after.py [new file with mode: 0644]
python/testData/intentions/SpecifyTypeInPy3AnnotationsIntentionTest/foo_decl.py [new file with mode: 0644]
python/testData/intentions/SpecifyTypeInPy3AnnotationsIntentionTest/foo_decl_after.py [new file with mode: 0644]
python/testSrc/com/jetbrains/env/PyEnvTaskRunner.java
python/testSrc/com/jetbrains/env/PyTestTask.java
python/testSrc/com/jetbrains/env/python/PyDynamicTypesTest.java [new file with mode: 0644]
python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java
python/testSrc/com/jetbrains/env/python/debug/PyBaseDebuggerTask.java
python/testSrc/com/jetbrains/env/python/debug/PyDebuggerTask.java
python/testSrc/com/jetbrains/python/inspections/PyMissingTypeHintsInspectionTest.java [new file with mode: 0644]
python/testSrc/com/jetbrains/python/intentions/PyAnnotateTypesIntentionTest.java [new file with mode: 0644]
python/testSrc/com/jetbrains/python/intentions/PyIntentionTestCase.java
python/testSrc/com/jetbrains/python/intentions/SpecifyTypeInPy3AnnotationsIntentionTest.java [new file with mode: 0644]
python/testSrc/com/jetbrains/python/sdkTools/PyTestSdkTools.java
resources/src/META-INF/IdeaPlugin.xml
spellchecker/src/com/intellij/spellchecker/tokenizer/HtmlSpellcheckingStrategy.java
spellchecker/testData/inspection/xmlWithMistakes/test.html
test-log.xml
xml/impl/src/com/intellij/codeInsight/completion/XmlCompletionContributor.java
xml/tests/src/com/intellij/codeInsight/editorActions/EscapeEntitiesActionTest.java
xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java
xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlPathReferenceInspection.java
xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileType.java
xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlLikeFileType.java

index 6a34ac96283c5443813292e952c65c0f2f3e61fd..9de0ff44768b51b2d9035ca564dfcc02d542aec8 100644 (file)
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Groovy">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/groovy-all-2.3.9.jar!/"/>
+      <root url="jar://$PROJECT_DIR$/lib/groovy-all-2.4.6.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/groovy-all-2.3.9-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/groovy-all-2.4.6-sources.jar!/" />
     </SOURCES>
   </library>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/SceneBuilderKit.xml b/.idea/libraries/SceneBuilderKit.xml
new file mode 100644 (file)
index 0000000..1cf071d
--- /dev/null
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="SceneBuilderKit">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/plugins/javaFX/lib/SceneBuilderKit-8.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
index 7ad0282482ac98efc704546e09a04cbd2d60e269..e7cc2e2458d857ec53c687009905373ef7fd24fa 100644 (file)
@@ -295,9 +295,8 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
           jar("common-javaFX-plugin.jar") {
             module("common-javaFX-plugin")
           }
+          fileset(dir: "${home}/plugins/javaFX/lib", includes: "SceneBuilderKit-8.1.1.jar");
         }
-
-        fileset(dir: "${home}/plugins/javaFX/FxBuilderEmbedder/lib", includes: "embedder.jar");
       }
     }
 
index e6bebbd2fed652ebba7a90c2ecedf145bfed54e6..3f0eaf561e28ce6e07d311250a9e0d001588cebb 100644 (file)
@@ -69,7 +69,7 @@ binding.setVariable("checkLibLicenses", {
     }
   }
 
-  def libWithLicenses = licensesList.collectAll {it.libraryNames}.flatten() as Set
+  def libWithLicenses = licensesList.collect {it.libraryNames}.flatten() as Set
   libWithLicenses.addAll(jetbrainsLibraries)
 
   List<String> withoutLicenses = []
@@ -204,7 +204,7 @@ libraryLicense(name: "gradle-tooling-api-2.9.jar", version: "2.9", license: "Apa
 libraryLicense(name: "Gradle", version: "2.9", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
 libraryLicense(name: "GradleGuava", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "GradleJnaPosix", version: "1.0.3", license: "LGPL 2.1", url: "http://www.jruby.org/", licenseUrl: "http://www.gnu.org/licenses/lgpl-2.1.txt")
-libraryLicense(name: "Groovy", version: "2.3.9", license: "Apache 2.0", url: "http://groovy.codehaus.org/")
+libraryLicense(name: "Groovy", version: "2.4.6", license: "Apache 2.0", url: "http://groovy-lang.org/")
 libraryLicense(name: "Gson", version: "2.2.4", libraryName: "gson", license: "Apache 2.0", url: "http://code.google.com/p/google-gson/")
 libraryLicense(name: "Guava", libraryName: "guava-tools", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://ant.apache.org/license.html")
 libraryLicense(name: "Guava", version: "17.0", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://ant.apache.org/license.html")
@@ -284,6 +284,7 @@ libraryLicense(name: "Rhino JavaScript Engine", libraryName: "rhino-js-1_7R4", v
 libraryLicense(name: "RMI Stubs", attachedTo: "xslt-debugger-engine", license: "Apache 2.0", url: "https://confluence.jetbrains.com/display/CONTEST/XSLT-Debugger", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "Saxon-6.5.5", version: "6.5.5", license: "Mozilla Public License", url: "http://saxon.sourceforge.net/", licenseUrl: "http://www.mozilla.org/MPL/")
 libraryLicense(name: "Saxon-9HE", version: "9", license: "Mozilla Public License", url: "http://saxon.sourceforge.net/", licenseUrl: "http://www.mozilla.org/MPL/")
+libraryLicense(name: "SceneBuilderKit", version: "8.1.1", license: "BSD", url: "http://gluonhq.com/open-source/scene-builder/", licenseUrl: "http://www.oracle.com/technetwork/licenses/bsd-license-1835287.html")
 libraryLicense(name: "Sequence", libraryName: "sequence-library.jar", version: "bundled with SVNKit", license: "BSD (see LICENSE.txt in sequence-library.jar)", url:"http://www.syntevo.com")
 libraryLicense(name: "six.py", attachedTo: "python-helpers", version: "1.9.0", license: "MIT", url: "http://pythonhosted.org/six/")
 libraryLicense(name: "Slf4j", version: "1.7.10", license: "MIT License", url: "http://slf4j.org/", licenseUrl: "http://slf4j.org/license.html")
index d505aa153ec54ab65a6a63e19e82cc662654fed1..829dfd3c7375794a16ba8e5667759e715e999b32 100644 (file)
@@ -1,5 +1,5 @@
 <component>
-  <version codename="Community Edition" major="16" minor="0" eap="true"/>
+  <version codename="Community Edition 16.7" major="2016" minor="2" eap="true"/>
   <company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE"/>
   <build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
   <install-over minbuild="129.1" maxbuild="139.9999" version="14"/>
index 4f2c7fdb9ad4a7f01663bea791bdf7c580e6d512..eb47039e76c21ebb31f380f6ef2e623503fe81e7 100644 (file)
@@ -150,17 +150,18 @@ public class ToggleFieldBreakpointAction extends AnAction {
     if(selectedNode != null && selectedNode.getDescriptor() instanceof FieldDescriptorImpl) {
       final DebuggerContextImpl debuggerContext = DebuggerAction.getDebuggerContext(dataContext);
       final DebugProcessImpl debugProcess = debuggerContext.getDebugProcess();
-      if (debugProcess != null) { // if there is an active debugsession
+      if (debugProcess != null) { // if there is an active debug session
         final Ref<SourcePosition> positionRef = new Ref<>(null);
         debugProcess.getManagerThread().invokeAndWait(new DebuggerContextCommandImpl(debuggerContext) {
+          @Override
           public Priority getPriority() {
             return Priority.HIGH;
           }
+
+          @Override
           public void threadAction() {
-            ApplicationManager.getApplication().runReadAction(new Runnable() {
-              public void run() {
-                positionRef.set(SourcePositionProvider.getSourcePosition(selectedNode.getDescriptor(), project, debuggerContext));
-              }
+            ApplicationManager.getApplication().runReadAction(() -> {
+              positionRef.set(SourcePositionProvider.getSourcePosition(selectedNode.getDescriptor(), project, debuggerContext));
             });
           }
         });
index 05e7e380cb078197999b1f792da2969b02894413..e1fe0f99696787c87f4eb4ac04d2cbae8373ad7b 100644 (file)
@@ -135,7 +135,7 @@ public class VirtualMachineProxyImpl implements JdiTimer, VirtualMachineProxy {
           candidates.removeAll(nested2);
         }
         
-        nestedTypes = candidates.isEmpty()? Collections.<ReferenceType>emptyList() : new ArrayList<>(candidates);
+        nestedTypes = candidates.isEmpty() ? Collections.emptyList() : new ArrayList<>(candidates);
       }
       else {
         nestedTypes = Collections.emptyList();
@@ -193,10 +193,7 @@ public class VirtualMachineProxyImpl implements JdiTimer, VirtualMachineProxy {
 
   public void threadStarted(ThreadReference thread) {
     DebuggerManagerThreadImpl.assertIsManagerThread();
-    final Map<ThreadReference, ThreadReferenceProxyImpl> allThreads = myAllThreads;
-    if (!allThreads.containsKey(thread)) {
-      allThreads.put(thread, new ThreadReferenceProxyImpl(this, thread));
-    }
+    getThreadReferenceProxy(thread); // add a proxy
   }
 
   public void threadStopped(ThreadReference thread) {
@@ -576,13 +573,7 @@ public class VirtualMachineProxyImpl implements JdiTimer, VirtualMachineProxy {
       return null;
     }
 
-    ThreadReferenceProxyImpl proxy = myAllThreads.get(thread);
-    if (proxy == null) {
-      proxy = new ThreadReferenceProxyImpl(this, thread);
-      myAllThreads.put(thread, proxy);
-    }
-
-    return proxy;
+    return myAllThreads.computeIfAbsent(thread, t -> new ThreadReferenceProxyImpl(this, t));
   }
 
   public ThreadGroupReferenceProxyImpl getThreadGroupReferenceProxy(ThreadGroupReference group) {
index 9e76d0157ec89c08864785ea57571dc5d1459e3f..6b6bca6252914d209d5c11971b3d917f953a6752 100644 (file)
@@ -25,7 +25,10 @@ import com.intellij.debugger.DebuggerInvocationUtil;
 import com.intellij.debugger.engine.BreakpointStepMethodFilter;
 import com.intellij.debugger.engine.DebugProcessImpl;
 import com.intellij.debugger.engine.requests.RequestManagerImpl;
-import com.intellij.debugger.impl.*;
+import com.intellij.debugger.impl.DebuggerContextImpl;
+import com.intellij.debugger.impl.DebuggerContextListener;
+import com.intellij.debugger.impl.DebuggerManagerImpl;
+import com.intellij.debugger.impl.DebuggerSession;
 import com.intellij.debugger.ui.JavaDebuggerSupport;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -74,8 +77,8 @@ import java.util.Map;
 public class BreakpointManager {
   private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.BreakpointManager");
 
-  @NonNls private static final String MASTER_BREAKPOINT_TAGNAME = "master_breakpoint";
-  @NonNls private static final String SLAVE_BREAKPOINT_TAGNAME = "slave_breakpoint";
+  @NonNls private static final String MASTER_BREAKPOINT_TAG_NAME = "master_breakpoint";
+  @NonNls private static final String SLAVE_BREAKPOINT_TAG_NAME = "slave_breakpoint";
   @NonNls private static final String DEFAULT_SUSPEND_POLICY_ATTRIBUTE_NAME = "default_suspend_policy";
   @NonNls private static final String DEFAULT_CONDITION_STATE_ATTRIBUTE_NAME = "default_condition_enabled";
 
@@ -144,19 +147,16 @@ public class BreakpointManager {
   }
 
   public void editBreakpoint(final Breakpoint breakpoint, final Editor editor) {
-    DebuggerInvocationUtil.swingInvokeLater(myProject, new Runnable() {
-      @Override
-      public void run() {
-        XBreakpoint xBreakpoint = breakpoint.myXBreakpoint;
-        if (xBreakpoint instanceof XLineBreakpointImpl) {
-          RangeHighlighter highlighter = ((XLineBreakpointImpl)xBreakpoint).getHighlighter();
-          if (highlighter != null) {
-            GutterIconRenderer renderer = highlighter.getGutterIconRenderer();
-            if (renderer != null) {
-              DebuggerSupport.getDebuggerSupport(JavaDebuggerSupport.class).getEditBreakpointAction().editBreakpoint(
-                myProject, editor, breakpoint.myXBreakpoint, renderer
-              );
-            }
+    DebuggerInvocationUtil.swingInvokeLater(myProject, () -> {
+      XBreakpoint xBreakpoint = breakpoint.myXBreakpoint;
+      if (xBreakpoint instanceof XLineBreakpointImpl) {
+        RangeHighlighter highlighter = ((XLineBreakpointImpl)xBreakpoint).getHighlighter();
+        if (highlighter != null) {
+          GutterIconRenderer renderer = highlighter.getGutterIconRenderer();
+          if (renderer != null) {
+            DebuggerSupport.getDebuggerSupport(JavaDebuggerSupport.class).getEditBreakpointAction().editBreakpoint(
+              myProject, editor, breakpoint.myXBreakpoint, renderer
+            );
           }
         }
       }
@@ -242,24 +242,21 @@ public class BreakpointManager {
   public ExceptionBreakpoint addExceptionBreakpoint(@NotNull final String exceptionClassName, final String packageName) {
     ApplicationManager.getApplication().assertIsDispatchThread();
     final JavaExceptionBreakpointType type = XDebuggerUtil.getInstance().findBreakpointType(JavaExceptionBreakpointType.class);
-    return ApplicationManager.getApplication().runWriteAction(new Computable<ExceptionBreakpoint>() {
-      @Override
-      public ExceptionBreakpoint compute() {
-        XBreakpoint<JavaExceptionBreakpointProperties> xBreakpoint = XDebuggerManager.getInstance(myProject).getBreakpointManager()
-          .addBreakpoint(type, new JavaExceptionBreakpointProperties(exceptionClassName, packageName));
-        Breakpoint javaBreakpoint = getJavaBreakpoint(xBreakpoint);
-        if (javaBreakpoint instanceof ExceptionBreakpoint) {
-          ExceptionBreakpoint exceptionBreakpoint = (ExceptionBreakpoint)javaBreakpoint;
-          exceptionBreakpoint.setQualifiedName(exceptionClassName);
-          exceptionBreakpoint.setPackageName(packageName);
-          addBreakpoint(exceptionBreakpoint);
-          if (LOG.isDebugEnabled()) {
-            LOG.debug("ExceptionBreakpoint Added");
-          }
-          return exceptionBreakpoint;
+    return ApplicationManager.getApplication().runWriteAction((Computable<ExceptionBreakpoint>)() -> {
+      XBreakpoint<JavaExceptionBreakpointProperties> xBreakpoint = XDebuggerManager.getInstance(myProject).getBreakpointManager()
+        .addBreakpoint(type, new JavaExceptionBreakpointProperties(exceptionClassName, packageName));
+      Breakpoint javaBreakpoint = getJavaBreakpoint(xBreakpoint);
+      if (javaBreakpoint instanceof ExceptionBreakpoint) {
+        ExceptionBreakpoint exceptionBreakpoint = (ExceptionBreakpoint)javaBreakpoint;
+        exceptionBreakpoint.setQualifiedName(exceptionClassName);
+        exceptionBreakpoint.setPackageName(packageName);
+        addBreakpoint(exceptionBreakpoint);
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("ExceptionBreakpoint Added");
         }
-        return null;
+        return exceptionBreakpoint;
       }
+      return null;
     });
   }
 
@@ -279,14 +276,9 @@ public class BreakpointManager {
   private <B extends XBreakpoint<?>> XLineBreakpoint addXLineBreakpoint(Class<? extends XBreakpointType<B,?>> typeCls, Document document, final int lineIndex) {
     final XBreakpointType<B, ?> type = XDebuggerUtil.getInstance().findBreakpointType(typeCls);
     final VirtualFile file = FileDocumentManager.getInstance().getFile(document);
-    return ApplicationManager.getApplication().runWriteAction(new Computable<XLineBreakpoint>() {
-      @Override
-      public XLineBreakpoint compute() {
-        return XDebuggerManager.getInstance(myProject).getBreakpointManager()
-          .addLineBreakpoint((XLineBreakpointType)type, file.getUrl(), lineIndex,
-                             ((XLineBreakpointType)type).createBreakpointProperties(file, lineIndex));
-      }
-    });
+    return ApplicationManager.getApplication().runWriteAction((Computable<XLineBreakpoint>)() -> XDebuggerManager.getInstance(myProject).getBreakpointManager()
+      .addLineBreakpoint((XLineBreakpointType)type, file.getUrl(), lineIndex,
+                         ((XLineBreakpointType)type).createBreakpointProperties(file, lineIndex)));
   }
 
   /**
@@ -317,107 +309,98 @@ public class BreakpointManager {
       doRead(parentNode);
     }
     else {
-      myStartupManager.registerPostStartupActivity(new Runnable() {
-        @Override
-        public void run() {
-          doRead(parentNode);
-        }
-      });
+      myStartupManager.registerPostStartupActivity(() -> doRead(parentNode));
     }
   }
 
   private void doRead(@NotNull final Element parentNode) {
-    ApplicationManager.getApplication().runReadAction(new Runnable() {
-      @Override
-      @SuppressWarnings({"HardCodedStringLiteral"})
-      public void run() {
-        final Map<String, Breakpoint> nameToBreakpointMap = new THashMap<>();
-        try {
-          final List groups = parentNode.getChildren();
-          for (final Object group1 : groups) {
-            final Element group = (Element)group1;
-            if (group.getName().equals(RULES_GROUP_NAME)) {
-              continue;
-            }
-            // skip already converted
-            if (group.getAttribute(CONVERTED_PARAM) != null) {
-              continue;
-            }
-            final String categoryName = group.getName();
-            final Key<Breakpoint> breakpointCategory = BreakpointCategory.lookup(categoryName);
-            final String defaultPolicy = group.getAttributeValue(DEFAULT_SUSPEND_POLICY_ATTRIBUTE_NAME);
-            final boolean conditionEnabled = Boolean.parseBoolean(group.getAttributeValue(DEFAULT_CONDITION_STATE_ATTRIBUTE_NAME, "true"));
-            setBreakpointDefaults(breakpointCategory, new BreakpointDefaults(defaultPolicy, conditionEnabled));
-            Element anyExceptionBreakpointGroup;
-            if (!AnyExceptionBreakpoint.ANY_EXCEPTION_BREAKPOINT.equals(breakpointCategory)) {
-              // for compatibility with previous format
-              anyExceptionBreakpointGroup = group.getChild(AnyExceptionBreakpoint.ANY_EXCEPTION_BREAKPOINT.toString());
-              //final BreakpointFactory factory = BreakpointFactory.getInstance(breakpointCategory);
-              //if (factory != null) {
-                for (Element breakpointNode : group.getChildren("breakpoint")) {
-                  //Breakpoint breakpoint = factory.createBreakpoint(myProject, breakpointNode);
-                  Breakpoint breakpoint = createBreakpoint(categoryName, breakpointNode);
-                  breakpoint.readExternal(breakpointNode);
-                  nameToBreakpointMap.put(breakpoint.getDisplayName(), breakpoint);
-                }
-              //}
-            }
-            else {
-              anyExceptionBreakpointGroup = group;
-            }
+    ApplicationManager.getApplication().runReadAction(() -> {
+      final Map<String, Breakpoint> nameToBreakpointMap = new THashMap<>();
+      try {
+        final List groups = parentNode.getChildren();
+        for (final Object group1 : groups) {
+          final Element group = (Element)group1;
+          if (group.getName().equals(RULES_GROUP_NAME)) {
+            continue;
+          }
+          // skip already converted
+          if (group.getAttribute(CONVERTED_PARAM) != null) {
+            continue;
+          }
+          final String categoryName = group.getName();
+          final Key<Breakpoint> breakpointCategory = BreakpointCategory.lookup(categoryName);
+          final String defaultPolicy = group.getAttributeValue(DEFAULT_SUSPEND_POLICY_ATTRIBUTE_NAME);
+          final boolean conditionEnabled = Boolean.parseBoolean(group.getAttributeValue(DEFAULT_CONDITION_STATE_ATTRIBUTE_NAME, "true"));
+          setBreakpointDefaults(breakpointCategory, new BreakpointDefaults(defaultPolicy, conditionEnabled));
+          Element anyExceptionBreakpointGroup;
+          if (!AnyExceptionBreakpoint.ANY_EXCEPTION_BREAKPOINT.equals(breakpointCategory)) {
+            // for compatibility with previous format
+            anyExceptionBreakpointGroup = group.getChild(AnyExceptionBreakpoint.ANY_EXCEPTION_BREAKPOINT.toString());
+            //final BreakpointFactory factory = BreakpointFactory.getInstance(breakpointCategory);
+            //if (factory != null) {
+              for (Element breakpointNode : group.getChildren("breakpoint")) {
+                //Breakpoint breakpoint = factory.createBreakpoint(myProject, breakpointNode);
+                Breakpoint breakpoint = createBreakpoint(categoryName, breakpointNode);
+                breakpoint.readExternal(breakpointNode);
+                nameToBreakpointMap.put(breakpoint.getDisplayName(), breakpoint);
+              }
+            //}
+          }
+          else {
+            anyExceptionBreakpointGroup = group;
+          }
 
-            if (anyExceptionBreakpointGroup != null) {
-              final Element breakpointElement = group.getChild("breakpoint");
-              if (breakpointElement != null) {
-                XBreakpointManager manager = XDebuggerManager.getInstance(myProject).getBreakpointManager();
-                JavaExceptionBreakpointType type = XDebuggerUtil.getInstance().findBreakpointType(JavaExceptionBreakpointType.class);
-                XBreakpoint<JavaExceptionBreakpointProperties> xBreakpoint = manager.getDefaultBreakpoint(type);
-                Breakpoint breakpoint = getJavaBreakpoint(xBreakpoint);
-                if (breakpoint != null) {
-                  breakpoint.readExternal(breakpointElement);
-                  addBreakpoint(breakpoint);
-                }
+          if (anyExceptionBreakpointGroup != null) {
+            final Element breakpointElement = group.getChild("breakpoint");
+            if (breakpointElement != null) {
+              XBreakpointManager manager = XDebuggerManager.getInstance(myProject).getBreakpointManager();
+              JavaExceptionBreakpointType type = XDebuggerUtil.getInstance().findBreakpointType(JavaExceptionBreakpointType.class);
+              XBreakpoint<JavaExceptionBreakpointProperties> xBreakpoint = manager.getDefaultBreakpoint(type);
+              Breakpoint breakpoint = getJavaBreakpoint(xBreakpoint);
+              if (breakpoint != null) {
+                breakpoint.readExternal(breakpointElement);
+                addBreakpoint(breakpoint);
               }
             }
           }
         }
-        catch (InvalidDataException ignored) {
-        }
-
-        final Element rulesGroup = parentNode.getChild(RULES_GROUP_NAME);
-        if (rulesGroup != null) {
-          final List<Element> rules = rulesGroup.getChildren("rule");
-          for (Element rule : rules) {
-            // skip already converted
-            if (rule.getAttribute(CONVERTED_PARAM) != null) {
-              continue;
-            }
-            final Element master = rule.getChild(MASTER_BREAKPOINT_TAGNAME);
-            if (master == null) {
-              continue;
-            }
-            final Element slave = rule.getChild(SLAVE_BREAKPOINT_TAGNAME);
-            if (slave == null) {
-              continue;
-            }
-            final Breakpoint masterBreakpoint = nameToBreakpointMap.get(master.getAttributeValue("name"));
-            if (masterBreakpoint == null) {
-              continue;
-            }
-            final Breakpoint slaveBreakpoint = nameToBreakpointMap.get(slave.getAttributeValue("name"));
-            if (slaveBreakpoint == null) {
-              continue;
-            }
+      }
+      catch (InvalidDataException ignored) {
+      }
 
-            boolean leaveEnabled = "true".equalsIgnoreCase(rule.getAttributeValue("leaveEnabled"));
-            XDependentBreakpointManager dependentBreakpointManager = ((XBreakpointManagerImpl)getXBreakpointManager()).getDependentBreakpointManager();
-            dependentBreakpointManager.setMasterBreakpoint(slaveBreakpoint.myXBreakpoint, masterBreakpoint.myXBreakpoint, leaveEnabled);
-            //addBreakpointRule(new EnableBreakpointRule(BreakpointManager.this, masterBreakpoint, slaveBreakpoint, leaveEnabled));
+      final Element rulesGroup = parentNode.getChild(RULES_GROUP_NAME);
+      if (rulesGroup != null) {
+        final List<Element> rules = rulesGroup.getChildren("rule");
+        for (Element rule : rules) {
+          // skip already converted
+          if (rule.getAttribute(CONVERTED_PARAM) != null) {
+            continue;
+          }
+          final Element master = rule.getChild(MASTER_BREAKPOINT_TAG_NAME);
+          if (master == null) {
+            continue;
+          }
+          final Element slave = rule.getChild(SLAVE_BREAKPOINT_TAG_NAME);
+          if (slave == null) {
+            continue;
+          }
+          final Breakpoint masterBreakpoint = nameToBreakpointMap.get(master.getAttributeValue("name"));
+          if (masterBreakpoint == null) {
+            continue;
+          }
+          final Breakpoint slaveBreakpoint = nameToBreakpointMap.get(slave.getAttributeValue("name"));
+          if (slaveBreakpoint == null) {
+            continue;
           }
-        }
 
-        DebuggerInvocationUtil.invokeLater(myProject, BreakpointManager.this::updateBreakpointsUI);
+          boolean leaveEnabled = "true".equalsIgnoreCase(rule.getAttributeValue("leaveEnabled"));
+          XDependentBreakpointManager dependentBreakpointManager = ((XBreakpointManagerImpl)getXBreakpointManager()).getDependentBreakpointManager();
+          dependentBreakpointManager.setMasterBreakpoint(slaveBreakpoint.myXBreakpoint, masterBreakpoint.myXBreakpoint, leaveEnabled);
+          //addBreakpointRule(new EnableBreakpointRule(BreakpointManager.this, masterBreakpoint, slaveBreakpoint, leaveEnabled));
+        }
       }
+
+      DebuggerInvocationUtil.invokeLater(myProject, this::updateBreakpointsUI);
     });
 
     myUIProperties.clear();
@@ -462,12 +445,7 @@ public class BreakpointManager {
 
   private <B extends XBreakpoint<?>> XBreakpoint createXBreakpoint(Class<? extends XBreakpointType<B, ?>> typeCls) {
     final XBreakpointType<B, ?> type = XDebuggerUtil.getInstance().findBreakpointType(typeCls);
-    return ApplicationManager.getApplication().runWriteAction(new Computable<XBreakpoint>() {
-      @Override
-      public XBreakpoint compute() {
-        return XDebuggerManager.getInstance(myProject).getBreakpointManager().addBreakpoint((XBreakpointType)type, type.createProperties());
-      }
-    });
+    return ApplicationManager.getApplication().runWriteAction((Computable<XBreakpoint>)() -> XDebuggerManager.getInstance(myProject).getBreakpointManager().addBreakpoint((XBreakpointType)type, type.createProperties()));
   }
 
   private <B extends XBreakpoint<?>> XLineBreakpoint createXLineBreakpoint(Class<? extends XBreakpointType<B, ?>> typeCls,
@@ -503,11 +481,8 @@ public class BreakpointManager {
     if (breakpoint == null) {
       return;
     }
-    ApplicationManager.getApplication().runWriteAction(new Runnable() {
-      @Override
-      public void run() {
-        getXBreakpointManager().removeBreakpoint(breakpoint.myXBreakpoint);
-      }
+    ApplicationManager.getApplication().runWriteAction(() -> {
+      getXBreakpointManager().removeBreakpoint(breakpoint.myXBreakpoint);
     });
   }
 
@@ -523,17 +498,12 @@ public class BreakpointManager {
 
   @NotNull
   public List<Breakpoint> getBreakpoints() {
-    return ApplicationManager.getApplication().runReadAction(new Computable<List<Breakpoint>>() {
+    return ApplicationManager.getApplication().runReadAction((Computable<List<Breakpoint>>)() -> ContainerUtil.mapNotNull(getXBreakpointManager().getAllBreakpoints(), new Function<XBreakpoint<?>, Breakpoint>() {
       @Override
-      public List<Breakpoint> compute() {
-        return ContainerUtil.mapNotNull(getXBreakpointManager().getAllBreakpoints(), new Function<XBreakpoint<?>, Breakpoint>() {
-          @Override
-          public Breakpoint fun(XBreakpoint<?> xBreakpoint) {
-            return getJavaBreakpoint(xBreakpoint);
-          }
-        });
+      public Breakpoint fun(XBreakpoint<?> xBreakpoint) {
+        return getJavaBreakpoint(xBreakpoint);
       }
-    });
+    }));
   }
 
   @Nullable
index 06862f7b66d37c4fd7940fffc9187c2cc9204778..5cbaf8aaabec3ff49c7ec33329d4c6b8cf137f30 100644 (file)
@@ -26,6 +26,7 @@ import com.intellij.execution.remote.RemoteConfiguration;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.application.TransactionGuard;
 import com.intellij.openapi.compiler.CompileContext;
 import com.intellij.openapi.compiler.CompileScope;
 import com.intellij.openapi.compiler.CompileStatusNotification;
@@ -140,7 +141,7 @@ public class CompileStepBeforeRun extends BeforeRunTaskProvider<CompileStepBefor
         }
       };
 
-      SwingUtilities.invokeAndWait(new Runnable() {
+      TransactionGuard.submitTransaction(new Runnable() {
         public void run() {
           CompileScope scope;
           final CompilerManager compilerManager = CompilerManager.getInstance(myProject);
index 4f02890be7918a86c39d5f2d3061fa26daa37bd9..5a26d6a4aa20d7ca1842fc7297c357d086c531e8 100644 (file)
@@ -16,6 +16,9 @@
 package com.intellij.codeInsight.daemon.impl
 
 import com.intellij.ProjectTopics
+import com.intellij.diff.DiffContentFactory
+import com.intellij.diff.DiffManager
+import com.intellij.diff.requests.SimpleDiffRequest
 import com.intellij.openapi.fileEditor.FileEditor
 import com.intellij.openapi.fileEditor.OpenFileDescriptor
 import com.intellij.openapi.fileTypes.LanguageFileType
@@ -56,12 +59,19 @@ class LibrarySourceNotificationProvider(private val project: Project, notificati
         if (offender != null) {
           val panel = ColoredNotificationPanel(LightColors.RED)
           panel.setText(ProjectBundle.message("library.source.mismatch", offender.name))
-          panel.createActionLabel(ProjectBundle.message("library.source.open.class"), {
-            val classFile = offender.originalElement.containingFile?.virtualFile
-            if (classFile != null) {
-              OpenFileDescriptor(project, classFile, -1).navigate(true)
-            }
-          })
+
+          val clsFile = offender.originalElement.containingFile?.virtualFile
+          if (clsFile != null) {
+            panel.createActionLabel(ProjectBundle.message("library.source.open.class"), {
+              OpenFileDescriptor(project, clsFile, -1).navigate(true)
+            })
+            panel.createActionLabel(ProjectBundle.message("library.source.show.diff"), {
+              val cf = DiffContentFactory.getInstance()
+              val request = SimpleDiffRequest(null, cf.create(project, clsFile), cf.create(project, file), clsFile.path, file.path)
+              DiffManager.getInstance().showDiff(project, request)
+            })
+          }
+
           return panel
         }
       }
index 0c6bdaefcd68ec4b1fb66771abe74356d3a8ed3b..f5129a9f14670a573dca087fc23acab10f1995d6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -404,7 +404,7 @@ public abstract class ModuleEditor implements Place.Navigator, Disposable {
                                         new LibraryInvocationHandler((Library)result));
         }
         else if (result instanceof LibraryTable.ModifiableModel) {
-          return Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{LibraryTableBase.ModifiableModelEx.class},
+          return Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{LibraryTableBase.ModifiableModel.class},
                                         new LibraryTableModelInvocationHandler((LibraryTable.ModifiableModel)result));
         }
         if (result instanceof Library[]) {
index 00669c2cdcc7bf71e02f442910aa21eb405d1acf..107d3e9d5eb0d975cc6ec017d06a88fc04897269 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -38,7 +38,7 @@ import java.util.*;
  * Date: 04-Jun-2006
  */
 
-public class LibrariesModifiableModel implements LibraryTableBase.ModifiableModelEx {
+public class LibrariesModifiableModel implements LibraryTableBase.ModifiableModel {
   //todo[nik] remove LibraryImpl#equals method instead of using identity maps
   private final Map<Library, ExistingLibraryEditor> myLibrary2EditorMap =
     ContainerUtil.<Library, ExistingLibraryEditor>newIdentityTroveMap();
index aa48d6ccbd398e3fd6e016a73bcd0caa204b9e43..f678d46a98957a0c1fbb3f075bafec96f8697722 100644 (file)
@@ -27,9 +27,11 @@ import com.intellij.openapi.project.IndexNotReadyException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.JavaSdkVersion;
 import com.intellij.openapi.projectRoots.JavaVersionService;
+import com.intellij.openapi.roots.FileIndexFacade;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiClassImplUtil;
@@ -500,7 +502,7 @@ public class GenericsHighlightUtil {
         if (unrelatedMethodContainingClass == null) continue;
         if (!aClass.hasModifierProperty(PsiModifier.ABSTRACT) && astracts != null && unrelatedMethodContainingClass.isInterface()) {
           if (defaultMethodContainingClass.isInheritor(unrelatedMethodContainingClass, true) && 
-              MethodSignatureUtil.isSubsignature(unrelatedMethod.getSignature(PsiSubstitutor.EMPTY), 
+              MethodSignatureUtil.isSubsignature(unrelatedMethod.getSignature(TypeConversionUtil.getSuperClassSubstitutor(unrelatedMethodContainingClass, defaultMethodContainingClass, PsiSubstitutor.EMPTY)), 
                                                  defaultMethod.getSignature(PsiSubstitutor.EMPTY))) {
             continue;
           }
@@ -1489,6 +1491,15 @@ public class GenericsHighlightUtil {
                                               JavaPsiFacade factory) {
     final PsiClass aClass = PsiUtil.resolveClassInType(superType);
     if (aClass != null && classes.add(aClass)) {
+      VirtualFile vFile = PsiUtilCore.getVirtualFile(aClass);
+      if (vFile == null) {
+        return null;
+      }
+      FileIndexFacade index = FileIndexFacade.getInstance(aClass.getProject());
+      if (!index.isInSource(vFile) && !index.isInLibraryClasses(vFile)) {
+        return null;
+      }
+
       final String qualifiedName = aClass.getQualifiedName();
       if (qualifiedName != null && factory.findClass(qualifiedName, resolveScope) == null) {
         return "Cannot access " + HighlightUtil.formatClass(aClass);
index 0698df0e079e85e9ea55b3e90de1e1283267d78d..0f5ea34506f4b83383584e5507d39d8a03f52993 100644 (file)
@@ -24,7 +24,6 @@ import com.intellij.codeInsight.daemon.impl.quickfix.*;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInsight.intention.QuickFixFactory;
 import com.intellij.codeInspection.LocalQuickFixOnPsiElementAsIntentionAdapter;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.IndexNotReadyException;
 import com.intellij.openapi.projectRoots.JavaSdkVersion;
 import com.intellij.openapi.util.Comparing;
@@ -398,7 +397,7 @@ public class HighlightMethodUtil {
           String description = JavaErrorMessages.message("wrong.method.arguments", methodName, containerName, argTypes);
           final Ref<PsiElement> elementToHighlight = new Ref<PsiElement>(list);
           String toolTip;
-          if (parent instanceof PsiClass && !ApplicationManager.getApplication().isUnitTestMode()) {
+          if (parent instanceof PsiClass) {
             toolTip = buildOneLineMismatchDescription(list, candidateInfo, elementToHighlight);
             if (toolTip == null) {
               toolTip = createMismatchedArgumentsHtmlTooltip(candidateInfo, list);
index 80ce625903ceca24866c4f97d93a7d24815bee55..f2c5b513949865112af273ddd72839447b51bf60 100644 (file)
@@ -1391,7 +1391,13 @@ public class HighlightUtil extends HighlightUtilBase {
   @Nullable
   static HighlightInfo checkNotAStatement(@NotNull PsiStatement statement) {
     if (!PsiUtil.isStatement(statement) && !PsiUtilCore.hasErrorElementChild(statement)) {
-      String description = JavaErrorMessages.message("not.a.statement");
+      boolean isDeclarationNotAllowed = false;
+      if (statement instanceof PsiDeclarationStatement) {
+        final PsiElement parent = statement.getParent();
+        isDeclarationNotAllowed = parent instanceof PsiIfStatement || parent instanceof PsiLoopStatement;
+      }
+      
+      String description = JavaErrorMessages.message(isDeclarationNotAllowed ? "declaration.not.allowed" : "not.a.statement");
       return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(statement).descriptionAndTooltip(description).create();
     }
     return null;
index 15787fbaca3b61caa95af299cbca8a3c2b6f4b7b..ed19020840339e38bc9655d9bd6135b64b2e45b5 100644 (file)
@@ -21,6 +21,7 @@ import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil;
 import com.intellij.codeInsight.intention.HighPriorityAction;
+import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
@@ -33,9 +34,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.psi.controlFlow.AnalysisCanceledException;
 import com.intellij.psi.controlFlow.ControlFlow;
 import com.intellij.psi.controlFlow.ControlFlowUtil;
-import com.intellij.psi.impl.source.resolve.DefaultParameterTypeInferencePolicy;
 import com.intellij.psi.impl.source.resolve.graphInference.FunctionalInterfaceParameterizationUtil;
-import com.intellij.psi.infos.MethodCandidateInfo;
 import com.intellij.psi.util.*;
 import com.intellij.util.ArrayUtilRt;
 import com.intellij.util.Function;
@@ -44,7 +43,9 @@ import com.intellij.util.containers.ContainerUtilRt;
 import com.intellij.util.containers.hash.LinkedHashMap;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import javax.swing.*;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.*;
@@ -54,6 +55,8 @@ import java.util.*;
  */
 public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspectionTool {
   public static final Logger LOG = Logger.getInstance("#" + AnonymousCanBeLambdaInspection.class.getName());
+  
+  public boolean reportNotAnnotatedInterfaces = true;
 
   @Nls
   @NotNull
@@ -80,6 +83,12 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspection
     return "Convert2Lambda";
   }
 
+  @Nullable
+  @Override
+  public JComponent createOptionsPanel() {
+    return new SingleCheckboxOptionsPanel("Report when interface is not annotated with @FunctionalInterface", this, "reportNotAnnotatedInterfaces");
+  }
+
   @NotNull
   @Override
   public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
@@ -91,7 +100,7 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspection
         final PsiElement lambdaContext = parent != null ? parent.getParent() : null;
         if (lambdaContext != null && 
             (LambdaUtil.isValidLambdaContext(lambdaContext) || !(lambdaContext instanceof PsiExpressionStatement)) &&
-            canBeConvertedToLambda(aClass, false)) {
+            canBeConvertedToLambda(aClass, false, reportNotAnnotatedInterfaces)) {
           final PsiElement lBrace = aClass.getLBrace();
           LOG.assertTrue(lBrace != null);
           final TextRange rangeInElement = new TextRange(0, aClass.getStartOffsetInParent() + lBrace.getStartOffsetInParent());
@@ -170,8 +179,21 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspection
   }
 
   public static boolean canBeConvertedToLambda(PsiAnonymousClass aClass, boolean acceptParameterizedFunctionTypes) {
+    return canBeConvertedToLambda(aClass, acceptParameterizedFunctionTypes, true);
+  }
+
+  public static boolean canBeConvertedToLambda(PsiAnonymousClass aClass,
+                                               boolean acceptParameterizedFunctionTypes,
+                                               boolean reportNotAnnotatedInterfaces) {
     if (PsiUtil.getLanguageLevel(aClass).isAtLeast(LanguageLevel.JDK_1_8)) {
-      final PsiMethod interfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(aClass.getBaseClassType());
+      final PsiClassType baseClassType = aClass.getBaseClassType();
+      final PsiClassType.ClassResolveResult resolveResult = baseClassType.resolveGenerics();
+      final PsiClass baseClass = resolveResult.getElement();
+      if (baseClass == null || 
+          !reportNotAnnotatedInterfaces && !AnnotationUtil.isAnnotated(baseClass, CommonClassNames.JAVA_LANG_FUNCTIONAL_INTERFACE, false)) {
+        return false;
+      }
+      final PsiMethod interfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(resolveResult);
       if (interfaceMethod != null && (acceptParameterizedFunctionTypes || !interfaceMethod.hasTypeParameters())) {
         final PsiMethod[] methods = aClass.getMethods();
         if (methods.length == 1 && 
@@ -478,7 +500,9 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspection
         final PsiField field = PsiTreeUtil.getParentOfType(expression, PsiField.class);
         if (field != null) {
           final PsiElement resolved = expression.resolve();
-          if (resolved instanceof PsiField && ((PsiField)resolved).getContainingClass() == field.getContainingClass()) {
+          if (resolved instanceof PsiField && 
+              ((PsiField)resolved).getContainingClass() == field.getContainingClass() && 
+              expression.getQualifierExpression() == null) {
             final PsiExpression initializer = ((PsiField)resolved).getInitializer();
             if (initializer == null ||
                 resolved == field ||
index 04a925b970d9d687f40cd0052180c171724537e0..e5a4047c444607f9b270878d8741afad2016f254 100644 (file)
@@ -17,6 +17,7 @@ package com.intellij.codeInspection;
 
 import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.GroupNames;
+import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
@@ -25,6 +26,9 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.psi.util.RedundantCastUtil;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
 
 /**
  * User: anna
@@ -32,6 +36,8 @@ import org.jetbrains.annotations.NotNull;
 public class AnonymousCanBeMethodReferenceInspection extends BaseJavaBatchLocalInspectionTool {
   public static final Logger LOG = Logger.getInstance("#" + AnonymousCanBeMethodReferenceInspection.class.getName());
 
+  public boolean reportNotAnnotatedInterfaces = true;
+
   @Nls
   @NotNull
   @Override
@@ -57,6 +63,12 @@ public class AnonymousCanBeMethodReferenceInspection extends BaseJavaBatchLocalI
     return "Anonymous2MethodRef";
   }
 
+  @Nullable
+  @Override
+  public JComponent createOptionsPanel() {
+    return new SingleCheckboxOptionsPanel("Report when interface is not annotated with @FunctionalInterface", this, "reportNotAnnotatedInterfaces");
+  }
+
   @NotNull
   @Override
   public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
@@ -64,7 +76,7 @@ public class AnonymousCanBeMethodReferenceInspection extends BaseJavaBatchLocalI
       @Override
       public void visitAnonymousClass(PsiAnonymousClass aClass) {
         super.visitAnonymousClass(aClass);
-        if (AnonymousCanBeLambdaInspection.canBeConvertedToLambda(aClass, true)) {
+        if (AnonymousCanBeLambdaInspection.canBeConvertedToLambda(aClass, true, reportNotAnnotatedInterfaces)) {
           final PsiMethod method = aClass.getMethods()[0];
           final PsiCodeBlock body = method.getBody();
           final PsiCallExpression callExpression =
@@ -116,11 +128,8 @@ public class AnonymousCanBeMethodReferenceInspection extends BaseJavaBatchLocalI
           if (methods.length != 1) return;
 
           final PsiParameter[] parameters = methods[0].getParameterList().getParameters();
-          final PsiCallExpression callExpression = LambdaCanBeMethodReferenceInspection
-            .canBeMethodReferenceProblem(methods[0].getBody(), parameters, anonymousClass.getBaseClassType(), anonymousClass.getParent());
-          if (callExpression == null) return;
           final String methodRefText =
-            LambdaCanBeMethodReferenceInspection.createMethodReferenceText(callExpression, anonymousClass.getBaseClassType(), parameters);
+            LambdaCanBeMethodReferenceInspection.convertToMethodReference(methods[0].getBody(), parameters, anonymousClass.getBaseClassType(), anonymousClass.getParent());
 
           if (methodRefText != null) {
             final String canonicalText = anonymousClass.getBaseClassType().getCanonicalText();
index a339f183752d826f3945df7960a23292d93328c9..8fececf312589a107daec44a73a5c28801b1d097 100644 (file)
@@ -89,6 +89,16 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
       }
     };
   }
+  
+  @Nullable
+  public static String convertToMethodReference(@Nullable final PsiElement body,
+                                                final PsiParameter[] parameters,
+                                                final PsiType functionalInterfaceType,
+                                                @Nullable PsiElement context) {
+    final PsiCallExpression toConvertCall = canBeMethodReferenceProblem(body, parameters, functionalInterfaceType, context);
+    return createMethodReferenceText(toConvertCall, functionalInterfaceType, parameters);
+
+  }  
 
   @Nullable
   public static PsiCallExpression canBeMethodReferenceProblem(@Nullable final PsiElement body,
index 4fe7d118d917ca82f2b8334788f7240f1215d8ad..4fec5578159016d375efc2b967899a4babaad51e 100644 (file)
@@ -360,8 +360,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
         final PsiClassType functionalType = createDefaultConsumerType(project, parameter);
         final PsiParameter[] parameters = {parameter};
         final PsiElement bodyBlock = body instanceof PsiBlockStatement ? ((PsiBlockStatement)body).getCodeBlock() : body;
-        final PsiCallExpression toConvertCall = LambdaCanBeMethodReferenceInspection.canBeMethodReferenceProblem(bodyBlock, parameters, functionalType);
-        final String methodReferenceText = LambdaCanBeMethodReferenceInspection.createMethodReferenceText(toConvertCall, functionalType, parameters);
+        final String methodReferenceText = LambdaCanBeMethodReferenceInspection.convertToMethodReference(bodyBlock, parameters, functionalType, null);
         if (methodReferenceText != null) {
           return methodReferenceText;
         }
@@ -436,7 +435,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
           final StringBuilder builder = new StringBuilder(getIteratedValueText(iteratedValue) + ".stream()");
 
           builder.append(createFiltersChainText(body, parameter, ifStatement));
-          builder.append(createMapperFunctionalExpressionText(project, parameter, methodCallExpression.getArgumentList().getExpressions()[0]));
+          builder.append(createMapperFunctionalExpressionText(parameter, methodCallExpression.getArgumentList().getExpressions()[0]));
 
           builder.append(".collect(java.util.stream.Collectors.");
           PsiElement result = null;
@@ -502,32 +501,42 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
       }
     }
 
-    private static String createMapperFunctionalExpressionText(Project project, PsiParameter parameter, PsiExpression expression) {
+    private static String createMapperFunctionalExpressionText(PsiParameter parameter, PsiExpression expression) {
       String iteration = "";
       if (!isIdentityMapping(parameter, expression)) {
         iteration +=".map(";
-        final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
-        final PsiClass functionClass = psiFacade.findClass("java.util.function.Function", GlobalSearchScope.allScope(project));
-        final PsiType[] paramTypes = {parameter.getType(), expression.getType()};
-        for (int i = 0; i < paramTypes.length; i++) {
-          if (paramTypes[i] instanceof PsiPrimitiveType) {
-            paramTypes[i] = ((PsiPrimitiveType)paramTypes[i]).getBoxedType(expression);
-          }
-        }
-        final PsiClassType functionalInterfaceType = functionClass != null ? psiFacade.getElementFactory().createType(functionClass, paramTypes) : null;
-        final PsiCallExpression toConvertCall = LambdaCanBeMethodReferenceInspection
-          .canBeMethodReferenceProblem(expression, new PsiParameter[]{parameter}, functionalInterfaceType);
-        final String methodReferenceText = LambdaCanBeMethodReferenceInspection.createMethodReferenceText(toConvertCall, functionalInterfaceType, new PsiParameter[]{parameter});
-        if (methodReferenceText != null) {
-          LOG.assertTrue(functionalInterfaceType != null);
-          iteration += "(" + functionalInterfaceType.getCanonicalText() + ")" + methodReferenceText;
-        } else {
-          iteration += parameter.getName() + " -> " + expression.getText();
-        }
-        iteration += ")";
+        iteration += compoundLambdaOrMethodReference(parameter, expression, 
+                                                     "java.util.function.Function", 
+                                                     new PsiType[]{parameter.getType(), expression.getType()});
+        iteration +=")";
       }
       return iteration;
     }
+
+  }
+  private static String compoundLambdaOrMethodReference(PsiParameter parameter,
+                                                        PsiExpression expression,
+                                                        String samQualifiedName,
+                                                        PsiType[] samParamTypes) {
+    String result = "";
+    final Project project = parameter.getProject();
+    final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
+    final PsiClass functionClass = psiFacade.findClass(samQualifiedName, GlobalSearchScope.allScope(project));
+    for (int i = 0; i < samParamTypes.length; i++) {
+      if (samParamTypes[i] instanceof PsiPrimitiveType) {
+        samParamTypes[i] = ((PsiPrimitiveType)samParamTypes[i]).getBoxedType(expression);
+      }
+    }
+    final PsiClassType functionalInterfaceType = functionClass != null ? psiFacade.getElementFactory().createType(functionClass, samParamTypes) : null;
+    final PsiParameter[] parameters = {parameter};
+    final String methodReferenceText = LambdaCanBeMethodReferenceInspection.convertToMethodReference(expression