Remove a special Windows-only call to WinPtyProcess.destroy idea/163.191
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 14 Jun 2016 20:00:54 +0000 (23:00 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 14 Jun 2016 20:00:54 +0000 (23:00 +0300)
This code isn't necessary anymore. The agent process automatically exits
once it flushes the last of the scraped CONOUT/CONERR into its output
pipes (WINPTY_SPAWN_FLAG_EXIT_AFTER_SHUTDOWN). We wouldn't want to kill
the agent before that point, because we'd generally lose data.

Even without WINPTY_SPAWN_FLAG_EXIT_AFTER_SHUTDOWN, it shouldn't be
necessary anymore to kill the agent. Once all (one or both) of the
WinPtyProcess's WinPTYInputStream instances have been closed, the WinPty
object is closed, which calls winpty_free, which kills the agent.

Analogously, with UnixPtyProcess, the pty master FDs are closed when the
input streams are closed.

In theory, I think this code could prematurely close the agent connection
while it still has data in its CONOUT/CONERR NamedPipe output queues. If
that happened, the data would be lost.

888 files changed:
.idea/libraries/Netty.xml
.idea/libraries/pty4j.xml
RegExpSupport/src/org/intellij/lang/regexp/RegExpDocumentationProvider.java
RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHost.java
RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java
RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpForm.form
RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpForm.java
RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpIntentionAction.java
RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpElementVisitor.java
RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpOptions.java
RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpOptionsImpl.java
RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java
RegExpSupport/test/org/intellij/lang/regexp/RegExpParseTest.java
RegExpSupport/testData/RETest.xml
bin/WinLauncher/WinLauncher.exe
bin/WinLauncher/WinLauncher64.exe
bin/scripts/unix/idea.sh
build.txt
build/conf/ideaCE-launcher.properties
build/conf/ideaCE64-launcher.properties
build/scripts/download_jre.gant
build/scripts/download_kotlin.gant
build/scripts/libLicenses.gant
community-resources/src/idea/IdeaApplicationInfo.xml
images/src/META-INF/ImagesPlugin.xml
images/src/org/intellij/images/actions/EditExternallyAction.java
images/src/org/intellij/images/editor/actions/SetBackgroundImageDialog.form
images/src/org/intellij/images/editor/actions/SetBackgroundImageDialog.java
images/src/org/intellij/images/options/impl/ImagesConfigurable.java [new file with mode: 0644]
images/src/org/intellij/images/options/impl/ImagesOptions.form [moved from images/src/org/intellij/images/options/impl/Options.form with 99% similarity]
images/src/org/intellij/images/options/impl/ImagesOptionsComponent.java [moved from images/src/org/intellij/images/options/impl/OptionsUIForm.java with 98% similarity]
images/src/org/intellij/images/options/impl/ImagesOptionsTopHitProvider.java
images/src/org/intellij/images/options/impl/OptionsConfigurabe.java [deleted file]
images/src/org/intellij/images/statistics/BackgroundImagesUsageCollector.java [moved from images/src/org/intellij/images/statistics/BackgroundUsageCollector.java with 54% similarity]
java/compiler/impl/src/com/intellij/compiler/ant/GenerationOptionsImpl.java
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
java/compiler/instrumentation-util/src/com/intellij/compiler/notNullVerification/AuxiliaryMethodGenerator.java [new file with mode: 0644]
java/compiler/instrumentation-util/src/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenter.java
java/compiler/instrumentation-util/src/com/intellij/compiler/notNullVerification/ReportingMethod.java [new file with mode: 0644]
java/debugger/impl/src/com/intellij/debugger/DebugEnvironment.java
java/debugger/impl/src/com/intellij/debugger/DefaultDebugEnvironment.java
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
java/idea-ui/src/com/intellij/codeInsight/daemon/impl/JavaProjectSdkSetupValidator.java [new file with mode: 0644]
java/idea-ui/src/com/intellij/ide/actions/ImportModuleAction.java
java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java
java/idea-ui/src/com/intellij/ide/projectWizard/ProjectSettingsStep.java
java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
java/idea-ui/src/com/intellij/ide/util/projectWizard/JavaSettingsStep.java
java/idea-ui/src/com/intellij/ide/util/projectWizard/NamePathComponent.java
java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectNameStep.java
java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardUtil.java
java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
java/java-analysis-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspectionBase.java
java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaReferenceCompletionConfidence.java [new file with mode: 0644]
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java
java/java-impl/src/com/intellij/codeInsight/editorActions/JavaLineIndentProvider.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java
java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java
java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java
java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java
java/java-impl/src/com/intellij/lang/java/JavaBreadcrumbsInfoProvider.java [new file with mode: 0644]
java/java-impl/src/com/intellij/lang/java/JavaFindUsagesProvider.java
java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
java/java-impl/src/com/intellij/psi/impl/JavaRegExpHost.java
java/java-impl/src/com/intellij/psi/refResolve/RefResolveServiceImpl.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/ClassAnchor.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/ClassAnchorUtil.java [deleted file]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/HierarchyService.java [deleted file]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/HierarchyServiceImpl.java [new file with mode: 0644]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/IncompleteHierarchyException.java [new file with mode: 0644]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/JavaStubIndexer.java [moved from java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/hierarchy/JavaStubIndexer.java with 80% similarity]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/NamesEnumerator.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/PsiEnter.java [deleted file]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/PsiHierachyConnector.java [deleted file]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SingleClassHierarchy.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SingleClassHierarchyBuilder.java [deleted file]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SmartClassAnchor.java [deleted file]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubClassAnchor.java [new file with mode: 0644]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubEnter.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyConnector.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyIndex.java [new file with mode: 0644]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubResolver.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Symbol.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Symbols.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Translator.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/test/BuildStubsHierarchyAction.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/test/GetAllInheritorsAction.java [deleted file]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/test/InheritanceAction.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/test/LogSubtypesAction.java [deleted file]
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/test/TestStubHierarchyAction.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/stubs/ClassDeclaration.java
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectDialog.java
java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectClassDescriptor.java
java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectDelegate.java
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java
java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
java/java-impl/src/com/intellij/usageView/JavaUsageViewDescriptionProvider.java
java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaUnitDescriptor.java [moved from java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaUnitKeyDescriptor.java with 86% similarity]
java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaUnitIndex.java [deleted file]
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
java/java-indexing-impl/src/com/intellij/psi/impl/search/LazyConcurrentCollection.java [new file with mode: 0644]
java/java-indexing-impl/src/com/intellij/psi/impl/search/StubHierarchyInheritorSearcher.java [new file with mode: 0644]
java/java-indexing-impl/src/com/intellij/psi/stubsHierarchy/ClassHierarchy.java [new file with mode: 0644]
java/java-indexing-impl/src/com/intellij/psi/stubsHierarchy/HierarchyService.java [new file with mode: 0644]
java/java-indexing-impl/src/com/intellij/psi/stubsHierarchy/SmartClassAnchor.java [moved from java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/test/ClearSubtypesAction.java with 53% similarity]
java/java-indexing-impl/src/com/intellij/psi/stubsHierarchy/StubHierarchyIndexer.java [new file with mode: 0644]
java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
java/java-psi-api/src/com/intellij/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java [moved from java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java with 100% similarity]
java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java
java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java
java/java-psi-api/src/com/intellij/psi/impl/source/resolve/graphInference/PsiPolyExpressionUtil.java
java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
java/java-psi-api/src/com/intellij/psi/util/RedundantCastUtil.java
java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaLexer.flex
java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
java/java-psi-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/ScopedClassHierarchy.java
java/java-psi-impl/src/com/intellij/psi/impl/TypeCorrector.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaClassElementType.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaFieldStubElementType.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaParameterElementType.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/hierarchy/IndexTree.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassStubImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiFieldStubImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterStubImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/index/JavaStubIndexKeys.java
java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/StringLiteralManipulator.java
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java
java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaVariableConflictResolver.java
java/java-psi-impl/src/messages/JavaErrorMessages.properties
java/java-runtime/src/com/intellij/rt/execution/testFrameworks/ForkedSplitter.java
java/java-tests/testData/codeInsight/clsHighlighting/IDEA157254.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/clsHighlighting/OuterClassTypeArgs.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/clsHighlighting/libs/IDEA157254.jar [new file with mode: 0644]
java/java-tests/testData/codeInsight/clsHighlighting/libs/OuterClassTypeArgs.jar [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advFixture/HidingOnDemandImports.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advFixture/PackageNamedAsClassInDefaultPackage.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/AmbiguousConstants.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/DefaultPackageClassInStaticImport.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/InnerClassesShadowing.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/DiamondMisc.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/DiamondNeg12.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/DiamondNeg13.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/DiamondNeg14.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/DiamondNeg15.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/DiamondNeg8.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/DiamondNeg9.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/NestedDiamond.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting9/DiamondsWithAnonymousRejectInferredFreshVariables.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting9/DiamondsWithAnonymousRejectIntersectionType.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting9/DiamondsWithAnonymousRejectNotAccessibleType.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting9/TryWithResources.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/InnerClassRef.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/ErasureOfReturnTypeOfNonGenericMethod.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/InnerClassRef.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/IssueLinksInJavaDoc.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/diamond/DiagnosticMessageWhenConstructorIsUnresolved.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/diamond/EraseTypeForNewExpressionWithDiamondsIfUncheckedConversionWasPerformedDuringApplicabilityCheck.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/InferenceFromNotEqualTypeParamsBounds.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/PolyConditionalExpressionWithTargetPrimitive.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/afterSingleImportDisabledWhenOnDemandExists1.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/afterSingleImportDisabledWhenSingleStaticOnAnotherReferenceWithWrongSignatureExists.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/beforeSingleImportDisabledWhenOnDemandExists1.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/beforeSingleImportDisabledWhenSingleStaticOnAnotherReferenceExists.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/beforeSingleImportDisabledWhenSingleStaticOnAnotherReferenceWithWrongSignatureExists.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterCastInConditional.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterCastInConditional1.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterCastInConditional2.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeCastInConditional.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeCastInConditional1.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeCastInConditional2.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/javadocIG/fieldInitializedWithArray.html [new file with mode: 0644]
java/java-tests/testData/codeInsight/javadocIG/fieldInitializedWithArray.java [new file with mode: 0644]
java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enum/annotations.xml
java/java-tests/testData/inspection/dataFlow/fixture/LambdaParametersWithDefaultNullability.java
java/java-tests/testData/inspection/dataFlow/fixture/ParametersAreNonnullByDefault.java
java/java-tests/testData/inspection/fieldCanBeLocal/dontSimplifyRuntimeConstants/expected.xml [new file with mode: 0644]
java/java-tests/testData/inspection/fieldCanBeLocal/dontSimplifyRuntimeConstants/src/Test.java [new file with mode: 0644]
java/java-tests/testData/psi/parser-partial/declarations/Unclosed7.txt
java/java-tests/testData/psi/parser-partial/expressions/ArrayInitializer7.txt
java/java-tests/testData/psi/parser-partial/expressions/ArrayInitializer8.txt [new file with mode: 0644]
java/java-tests/testData/psi/parser-partial/expressions/ArrayInitializer9.txt [new file with mode: 0644]
java/java-tests/testData/psi/parser-partial/statements/TryNormal11.txt [new file with mode: 0644]
java/java-tests/testData/psi/parser-partial/statements/TryNormal12.txt [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethod/CodeDuplicatesWithEmptyStatementsBlocksParentheses.java [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethod/CodeDuplicatesWithEmptyStatementsBlocksParentheses_after.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameterObject/includeOneParameter/after/Param.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameterObject/includeOneParameter/after/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameterObject/includeOneParameter/before/Param.java [new file with mode: 0644]
java/java-tests/testData/refactoring/introduceParameterObject/includeOneParameter/before/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/after/p1/empty.txt [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/after/p2/First.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/after/p2/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/after/p3/First.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/after/p3/Second.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/after/p3/empty.txt [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/before/p1/First.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/before/p1/Second.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/before/p1/empty.txt [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/before/p2/First.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/before/p2/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/moveClass/conflictingNames/before/p3/empty.txt [new file with mode: 0644]
java/java-tests/testData/refactoring/pushDown/ReferenceForMovedInnerClass.java
java/java-tests/testData/refactoring/pushDown/ReferenceForMovedInnerClass_after.java
java/java-tests/testSrc/com/intellij/codeInsight/ClsGenerics18HighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/JavadocHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingFixtureTest.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/SdkSetupNotificationTest.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/SdkSetupNotificationTestBase.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java
java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
java/java-tests/testSrc/com/intellij/codeInspection/FieldCanBeLocalTest.java
java/java-tests/testSrc/com/intellij/codeInspection/OfflineInspectionResultViewTest.java
java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java
java/java-tests/testSrc/com/intellij/execution/filters/ExceptionWorkerTest.java
java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
java/java-tests/testSrc/com/intellij/lang/java/parser/partial/StatementParserTest.java
java/java-tests/testSrc/com/intellij/psi/ClsPsiTest.java
java/java-tests/testSrc/com/intellij/psi/JavaStubsTest.groovy
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaInvalidCodeFormatterTest.kt [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/psi/impl/file/impl/PsiEventsTest.java
java/java-tests/testSrc/com/intellij/psi/resolve/ResolveClassTest.java
java/java-tests/testSrc/com/intellij/psi/search/ClassInheritorsTest.java
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterObjectTest.java
java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java
java/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/deployment/debug/JavaDebuggerLauncherImpl.java
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java
jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ClassfileAnalyzer.java
jps/jps-builders/src/org/jetbrains/jps/javac/ExternalJavacManager.java
jps/model-impl/src/com/intellij/openapi/fileTypes/impl/IgnoredPatternSet.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/library/JpsLibraryTableSerializer.java
json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectAnnotator.java
json/tests/testData/jsonSchema/crossReferences/testFileForBaseProperties.json
json/tests/testData/jsonSchema/schemaFile/resolve/referencingSchema.json
lib/annotations/netty/io/netty/channel/annotations.xml
lib/libpty/readme.txt
lib/libpty/win/x86/libwinpty.dll [deleted file]
lib/libpty/win/x86/winpty-agent.exe
lib/libpty/win/x86/winpty.dll [new file with mode: 0755]
lib/libpty/win/x86_64/libwinpty.dll [deleted file]
lib/libpty/win/x86_64/winpty-agent.exe
lib/libpty/win/x86_64/winpty.dll [new file with mode: 0644]
lib/libpty/win/xp/libwinpty.dll [deleted file]
lib/libpty/win/xp/winpty-agent.exe
lib/libpty/win/xp/winpty.dll [new file with mode: 0755]
lib/netty-all-4.1.1.Final.jar [moved from lib/netty-all-4.1.0.CR7.jar with 58% similarity]
lib/pty4j-0.7.jar [moved from lib/pty4j-0.6.jar with 55% similarity]
lib/required_for_dist.txt
lib/src/netty-all-4.1.1.Final-sources.jar [moved from lib/src/netty-all-4.1.0.CR7-sources.jar with 65% similarity]
lib/src/pty4j-0.7-src.jar [moved from lib/src/pty4j-0.6-src.jar with 58% similarity]
native/WinLauncher/WinLauncher/WinLauncher.cpp
native/WinLauncher/WinLauncher/WinLauncher.rc
native/WinLauncher/WinLauncher/resource.h
platform/analysis-api/src/com/intellij/codeInspection/InspectionProfile.java
platform/analysis-api/src/com/intellij/codeInspection/ModifiableModel.java
platform/analysis-impl/src/com/intellij/codeHighlighting/RainbowHighlighter.java
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/ThreadLocalAnnotatorMap.java
platform/analysis-impl/src/com/intellij/codeInspection/actions/CleanupIntention.java
platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.java
platform/built-in-server/src/org/jetbrains/io/fastCgi/FastCgiRequest.kt
platform/built-in-server/src/org/jetbrains/io/jsonRpc/ClientManager.kt
platform/built-in-server/src/org/jetbrains/io/jsonRpc/JsonRpcServer.kt
platform/built-in-server/src/org/jetbrains/io/jsonRpc/socket/RpcBinaryRequestHandler.java
platform/built-in-server/src/org/jetbrains/io/webSocket/MessageChannelHandler.java
platform/built-in-server/src/org/jetbrains/io/webSocket/WebSocketHandshakeHandler.java
platform/built-in-server/src/org/jetbrains/io/webSocket/WebSocketProtocolHandler.kt [new file with mode: 0644]
platform/built-in-server/testSrc/ChannelBufferToStringTest.kt
platform/core-api/src/com/intellij/openapi/editor/StripTrailingSpacesFilter.java
platform/core-api/src/com/intellij/psi/LanguageSubstitutors.java
platform/core-api/src/com/intellij/psi/PsiQualifiedNamedElement.java
platform/core-api/src/com/intellij/util/indexing/ID.java
platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
platform/core-impl/src/com/intellij/openapi/editor/impl/PsiBasedStripTrailingSpacesFilter.java
platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java
platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeImpl.java
platform/core-impl/src/com/intellij/psi/css/MinifiedFilesUtil.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/PsiFileImplUtil.java
platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
platform/core-impl/src/com/intellij/psi/impl/source/SubstrateRef.java
platform/core-impl/src/com/intellij/psi/impl/source/tree/AstPath.java
platform/core-impl/src/com/intellij/psi/impl/source/tree/CompositeElement.java
platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
platform/core-impl/src/com/intellij/util/indexing/IndexingDataKeys.java
platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java
platform/diff-impl/src/com/intellij/diff/tools/util/base/ListenerDiffViewerBase.java
platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java
platform/editor-ui-api/src/com/intellij/ide/ui/UISettingsListener.java
platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsListener.java
platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java
platform/editor-ui-ex/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.java
platform/extensions/src/com/intellij/openapi/extensions/AbstractExtensionPointBean.java
platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionComponentAdapter.java
platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java
platform/extensions/src/com/intellij/util/pico/CachingConstructorInjectionComponentAdapter.java [moved from platform/extensions/src/com/intellij/util/pico/ConstructorInjectionComponentAdapter.java with 84% similarity]
platform/extensions/src/com/intellij/util/pico/DefaultPicoContainer.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java
platform/lang-api/src/com/intellij/execution/filters/FilterMixin.java
platform/lang-api/src/com/intellij/execution/ui/layout/ViewContext.java
platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java
platform/lang-api/src/com/intellij/ui/FileColorManager.java
platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/ProjectSdkSetupValidator.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InjectedGeneralHighlightingPass.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/RainbowIdentifierHighlighterPass.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/RainbowIdentifierHighlighterPassFactory.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/SdkSetupNotificationProvider.java [moved from java/idea-ui/src/com/intellij/codeInsight/daemon/impl/SetupSDKNotificationProvider.java with 53% similarity]
platform/lang-impl/src/com/intellij/codeInsight/documentation/QuickDocOnMouseOverManager.java
platform/lang-impl/src/com/intellij/codeInsight/editorActions/fillParagraph/ParagraphFillHandler.java
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
platform/lang-impl/src/com/intellij/codeInsight/template/Template.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateContext.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateImpl.java
platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixLiveTemplate.java
platform/lang-impl/src/com/intellij/codeInspection/actions/CodeCleanupAction.java
platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java
platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionProfileChooserForm.form
platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java
platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionIntention.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/QuickFixAction.java
platform/lang-impl/src/com/intellij/codeInspection/export/InspectionTreeHtmlWriter.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/ui/DefaultInspectionToolPresentation.java
platform/lang-impl/src/com/intellij/codeInspection/ui/ExcludedInspectionTreeNodesManager.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewComparator.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewUtil.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionToolPresentation.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java
platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java
platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemPreviewEditorPresentation.java
platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixPreviewPanelFactory.java
platform/lang-impl/src/com/intellij/codeInspection/ui/RefElementAndDescriptorAware.java
platform/lang-impl/src/com/intellij/codeInspection/ui/SuppressableInspectionTreeNode.java
platform/lang-impl/src/com/intellij/codeInspection/ui/actions/EditSettingsAction.java
platform/lang-impl/src/com/intellij/codeInspection/ui/actions/KeyAwareInspectionViewAction.java
platform/lang-impl/src/com/intellij/execution/RunManagerListener.java
platform/lang-impl/src/com/intellij/execution/TestStateStorage.java
platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java
platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
platform/lang-impl/src/com/intellij/ide/scratch/RootType.java
platform/lang-impl/src/com/intellij/ide/scratch/ScratchUtil.java
platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionItemProvider.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/TestEditorManagerImpl.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java
platform/lang-impl/src/com/intellij/platform/templates/LocalArchivedTemplate.java
platform/lang-impl/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java
platform/lang-impl/src/com/intellij/platform/templates/SystemFileProcessor.java
platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionToolsConfigurable.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/ProfilesChooser.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/ProfilesComboBox.java [moved from platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/ProfilesConfigurableComboBox.java with 58% similarity]
platform/lang-impl/src/com/intellij/psi/codeStyle/DetectAndAdjustIndentOptionsTask.java
platform/lang-impl/src/com/intellij/psi/codeStyle/KeepTrailingSpacesOnEmptyLinesFilterFactory.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/SemanticEditorPosition.java
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectionBackgroundSuppressor.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
platform/lang-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHelper.java
platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java
platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessorDelegateBase.java
platform/lang-impl/src/com/intellij/ui/tabs/FileColorManagerImpl.java
platform/lang-impl/src/com/intellij/ui/tabs/FileColorsModel.java
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesUpdater.java
platform/lvcs-impl/src/com/intellij/history/integration/patches/PatchCreator.java
platform/lvcs-impl/src/com/intellij/history/integration/ui/models/HistoryDialogModel.java
platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java
platform/platform-api/src/com/intellij/execution/process/ProcessTerminatedListener.java
platform/platform-api/src/com/intellij/notification/NotificationAction.java
platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java
platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java
platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
platform/platform-api/src/com/intellij/openapi/ui/FixedSizeButton.java
platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java
platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java
platform/platform-api/src/com/intellij/ui/components/JBViewport.java
platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
platform/platform-impl/src/com/intellij/diagnostic/DebugLogManager.kt
platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java
platform/platform-impl/src/com/intellij/help/impl/IdeaHelpBroker.java
platform/platform-impl/src/com/intellij/ide/CommandLineProcessor.java
platform/platform-impl/src/com/intellij/ide/MacOSApplicationProvider.java
platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java
platform/platform-impl/src/com/intellij/ide/actions/ToggleDistractionFreeModeAction.java
platform/platform-impl/src/com/intellij/ide/actions/ToggleToolbarAction.java
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaMenuBarBorder.java
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaMenuItemBorder.java
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaPopupMenuBorder.java
platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonPainter.java
platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJComboBoxUI.java
platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextBorder.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextFieldUI.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java
platform/platform-impl/src/com/intellij/idea/SocketLock.java
platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButtonWithText.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/IdeaActionButtonLook.java
platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
platform/platform-impl/src/com/intellij/openapi/components/impl/ServiceManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/ComplexTextFragment.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorPainter.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/LineLayout.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessProvider.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.java
platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/IgnoredFileCache.java
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java
platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshQueueImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/FloatingDecorator.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeBackgroundUtil.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeGlassPaneImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeMenuBar.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/PaintersHelper.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeBalloonLayoutImpl.java
platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
platform/platform-impl/src/com/intellij/ui/BalloonLayoutImpl.java
platform/platform-impl/src/com/intellij/ui/EditorTextField.java
platform/platform-impl/src/com/intellij/ui/JBTabsPaneImpl.java
platform/platform-impl/src/com/intellij/ui/NotificationBalloonActionProvider.java
platform/platform-impl/src/com/intellij/ui/TabbedPane.java
platform/platform-impl/src/com/intellij/ui/TabbedPaneWrapper.java
platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
platform/platform-impl/src/com/intellij/ui/mac/MacMainFrameDecorator.java
platform/platform-impl/src/com/intellij/ui/messages/SheetController.java
platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java
platform/platform-impl/src/io/netty/buffer/ByteBufUtf8Writer.java
platform/platform-impl/src/io/netty/buffer/ByteBufUtilEx.java
platform/platform-impl/src/org/jetbrains/io/ChannelBufferToString.java [deleted file]
platform/platform-impl/src/org/jetbrains/io/ChannelBufferToString.kt [new file with mode: 0644]
platform/platform-impl/src/org/jetbrains/io/ChannelRegistrar.java
platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandler.kt
platform/platform-impl/src/org/jetbrains/io/MessageDecoder.java
platform/platform-impl/src/org/jetbrains/io/NettyUtil.java
platform/platform-impl/src/org/jetbrains/io/netty.kt
platform/platform-resources-en/src/messages/IdeBundle.properties
platform/platform-resources-en/src/messages/InspectionsBundle.properties
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/platform-resources/src/META-INF/LangExtensions.xml
platform/platform-resources/src/META-INF/PlatformExtensions.xml
platform/platform-resources/src/brokenPlugins.txt
platform/platform-resources/src/componentSets/Xml.xml
platform/platform-resources/src/idea/PlatformActions.xml
platform/platform-resources/src/launcher.py
platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogPatchCreationTest.java
platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java
platform/platform-tests/testSrc/com/intellij/psi/impl/PsiDocumentManagerImplTest.java
platform/platform-tests/testSrc/com/intellij/psi/impl/search/LowLevelSearchUtilTest.java
platform/platform-tests/testSrc/com/intellij/util/concurrency/AppScheduledExecutorServiceTest.java
platform/platform-tests/testSrc/com/intellij/util/io/PersistenceStressTest.java
platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTest.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
platform/projectModel-impl/src/messages/ProjectBundle.properties
platform/script-debugger/backend/src/SuspendContextManager.kt
platform/script-debugger/debugger-ui/src/DebugProcessImpl.kt
platform/script-debugger/debugger-ui/src/RemoteVmConnection.kt
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/OutMessage.kt
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/TestComparisionFailedState.java
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/TestFailedState.java
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtil.java
platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyTestFixtureBuilderImpl.java
platform/testRunner/src/com/intellij/execution/testframework/CompositePrintable.java
platform/testRunner/src/com/intellij/execution/testframework/Printer.java
platform/testRunner/src/com/intellij/execution/testframework/export/TestResultsXmlFormatter.java
platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
platform/util-rt/src/com/intellij/openapi/util/Comparing.java
platform/util-rt/src/com/intellij/openapi/util/Couple.java
platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java
platform/util/resources/misc/registry.properties
platform/util/src/com/intellij/openapi/util/io/FileUtil.java
platform/util/src/com/intellij/openapi/util/text/StringUtil.java
platform/util/src/com/intellij/util/ComponentTreeEventDispatcher.java
platform/util/src/com/intellij/util/Restarter.java
platform/util/src/com/intellij/util/concurrency/Semaphore.java
platform/util/src/com/intellij/util/containers/HashSetQueue.java
platform/util/src/com/intellij/util/io/BaseDataReader.java
platform/util/src/com/intellij/util/io/BaseOutputReader.java
platform/util/src/com/intellij/util/io/OutputReader.java
platform/util/src/com/intellij/util/io/PagedFileStorage.java
platform/util/src/com/intellij/util/io/PersistentHashMap.java
platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java
platform/util/src/com/intellij/util/messages/impl/MessageBusImpl.java
platform/util/testSrc/com/intellij/util/containers/HashSetQueueTest.java
platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
platform/vcs-api/src/com/intellij/openapi/vcs/IssueNavigationConfiguration.java
platform/vcs-api/src/com/intellij/openapi/vcs/IssueNavigationLink.java
platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangesUtil.java
platform/vcs-api/src/com/intellij/openapi/vcs/changes/CommitSession.java
platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextPatchBuilder.java
platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/UnifiedDiffWriter.java
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotationsSettings.java
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/VcsPreviewPanel.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeManagerImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeVfsListener.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchConfigurationPanel.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchNameChecker.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchWriter.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentEP.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SessionDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/ui/ColorGenerator.java
platform/vcs-impl/testSrc/com/intellij/openapi/vcs/ui/ColorGeneratorTest.kt
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/HeavyAwareExecutor.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsProjectLog.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/CommitPanel.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/VcsLogGraphTable.java
platform/xdebugger-api/src/com/intellij/xdebugger/frame/XExecutionStack.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerFramesList.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XFramesView.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XStackFrameContainerEx.java [new file with mode: 0644]
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java
platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XTestValueNode.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryWithIdenticalCatchesInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/EquivalenceChecker.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/redundancy/UnusedLabelInspection.java
plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/conditional_expression_with_identical_branches/ConditionalExpressionWithIdenticalBranches.java
plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/if_statement_with_identical_branches/IfStatementWithIdenticalBranches.java
plugins/InspectionGadgets/test/com/siyeh/igtest/errorhandling/try_identical_catches/TryIdenticalCatches.after.java
plugins/InspectionGadgets/test/com/siyeh/igtest/errorhandling/try_identical_catches/TryIdenticalCatches.java
plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImportWizardTest.java
plugins/git4idea/src/git4idea/reset/GitResetOperation.java
plugins/gradle/jps-plugin/src/org/jetbrains/jps/gradle/model/impl/JpsGradleDependenciesEnumerationHandler.java
plugins/gradle/src/META-INF/plugin.xml
plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleExecuteTaskAction.java
plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleOpenScriptAction.java
plugins/gradle/src/org/jetbrains/plugins/gradle/codeInsight/AbstractGradleCompletionContributor.java
plugins/gradle/src/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginAction.java
plugins/gradle/src/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionHandler.java
plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleDefaultImportContributor.java
plugins/gradle/src/org/jetbrains/plugins/gradle/documentation/GradleDocumentationProvider.java
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/ExecutionInfo.java
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/TaskExecutionTreeTable.java
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/GradleSMTestProxy.java
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/GradleTestRunConfigurationProducer.java
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/GradleTestsExecutionConsoleManager.java
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/OpenGradleTestResultActionProvider.java
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/TestClassGradleConfigurationProducer.java
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/events/ConfigurationErrorEvent.java
plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/javaee/JavaEEGradleProjectResolverExtension.java
plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/ImportMavenRepositoriesTask.java
plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionHandler.java
plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/scala/ScalaGradleProjectResolverExtension.java
plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/War.java
plugins/gradle/src/org/jetbrains/plugins/gradle/remote/impl/GradleLibraryNamesMixer.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/cmd/GradleCommandLineOptionsConverter.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/BuildClasspathModuleGradleDataService.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectDataService.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectSerializer.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleModuleWizardStep.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleProjectOpenProcessor.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/resolve/GradleResolverUtil.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleProjectSettingsControl.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/task/GradleTaskManager.java
plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleToolWindowFactoryCondition.java
plugins/gradle/src/org/jetbrains/plugins/gradle/util/TextIcon.java
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalSourceDirectorySet.java
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceDirectorySet.java
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy
plugins/groovy/groovy-psi/resources/intentionDescriptions/AddReturnTypeFix/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/ConvertFromGeeseBracesIntention/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/ConvertMapToClassIntention/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/ConvertToGeeseBracesIntention/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/CreateParameterForFieldIntention/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/GrBreakStringOnLineBreaksIntention/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/InvertIfIntention/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/MoveClassToNewFileIntention/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/RemoveUnnecessaryEscapeCharactersIntention/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/RemoveUnnecessarySemicolonsIntention/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/ReplaceTernaryWithIfElseIntention/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/SimplifyTernaryOperatorIntention/description.html
plugins/groovy/groovy-psi/resources/intentionDescriptions/SplitIfIntention/description.html
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/GroovyTypeCheckVisitor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/CustomMembersGenerator.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/GroovyMethodDescriptor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/GroovyNamedArgumentProvider.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/NamedArgumentDescriptor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/NamedArgumentDescriptorBase.java [new file with mode: 0644]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/NamedArgumentDescriptorImpl.java [new file with mode: 0644]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/NamedArgumentReference.java [new file with mode: 0644]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/StringTypeCondition.java [new file with mode: 0644]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/TypeCondition.java [new file with mode: 0644]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/namedArgumentUtil.kt [new file with mode: 0644]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/GroovyConstructorNamedArgumentProvider.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/GroovyCoreEnvironment.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyDirectInheritorsSearcher.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyImportHelper.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/blocks/GrDelegatesToUtil.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrStubFileElementType.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/stubs/hierarchy/GrStubIndexer.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/FromStringHintProcessor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/DefaultImportContributor.kt [new file with mode: 0644]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrImportContributor.java [moved from plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/DefaultImportContributor.java with 63% similarity]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/implicitImports.kt [new file with mode: 0644]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/GroovyResolveKind.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/GroovyResolverProcessor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/GroovyResolverProcessorImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/swingBuilder/SwingBuilderNamedArgumentProvider.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/swingBuilder/SwingBuilderNonCodeMemberContributor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/TransformationContext.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/TransformationContextImpl.java
plugins/groovy/src/META-INF/plugin.xml
plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonDefaultImportContributor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/MapArgumentCompletionProvider.java
plugins/groovy/test/org/jetbrains/plugins/groovy/FastGroovyTestSuite.java [deleted file]
plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/SetupRule.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/builder/JsonBuilderTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/builder/StreamingJsonBuilderTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/builder/XmlMarkupBuilderTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/dependencies/GrDependencyVisitorTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
plugins/groovy/test/org/jetbrains/plugins/groovy/completion/builder/MiscBuilderTransformationTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/DsldTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/GroovyDslTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GrChangeToOperatorTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GrMethodMayBeStaticTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GroovyFallthroughInspectionTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyStressPerformanceTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/LiteralConstructorUsagesTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/JoinLineTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/aliasAnnotations/GrAnnotationCollectorTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrReturnPointHighlightingTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GrAliasedImportInheritorsTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/GrStubAstSwitchTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/DelegatesToSupportTest.groovy [new file with mode: 0644]
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GrDocResolveTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GrImportContributorTest.groovy [new file with mode: 0644]
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyResolveTestCase.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitCoercionTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveAnnotationAttributeTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethod23Test.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveWithDelegatesToTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/suites.groovy [new file with mode: 0644]
plugins/groovy/test/org/jetbrains/plugins/groovy/util/AllTestsSuite.java
plugins/groovy/test/org/jetbrains/plugins/groovy/util/Slow.java [new file with mode: 0644]
plugins/groovy/test/org/jetbrains/plugins/groovy/util/SlowPolicy.java [moved from java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/HierarchyConnector.java with 78% similarity]
plugins/groovy/test/org/jetbrains/plugins/groovy/util/TestPackage.java [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java
plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java
plugins/java-i18n/testData/inspections/duplicateStringLiteral/ApplyRenameForWholeFile.java [new file with mode: 0644]
plugins/java-i18n/testData/inspections/duplicateStringLiteral/ApplyRenameForWholeFileAfter.java [new file with mode: 0644]
plugins/java-i18n/testData/inspections/duplicateStringLiteral/PropertyKey.java [moved from plugins/java-i18n/testData/inspections/duplicateStringLiteral/propertyKey/src/Test.java with 52% similarity]
plugins/java-i18n/testData/inspections/duplicateStringLiteral/propertyKey/expected.xml [deleted file]
plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/DuplicateStringLiteralInspectionTest.java
plugins/javaFX/javaFX-CE/javaFX-CE.iml
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxSdkSetupNotificationTest.java [new file with mode: 0644]
plugins/javaFX/src/META-INF/common-javaFX-plugin.xml
plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxProjectSdkSetupValidator.java [new file with mode: 0644]
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyAttributeDescriptor.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/FxmlReferencesContributor.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxComponentIdReferenceProvider.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxLocationReferenceProvider.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxPropertyReference.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java
plugins/javaFX/testData/highlighting/nullObjectValue.fxml [new file with mode: 0644]
plugins/javaFX/testData/highlighting/nullPrimitiveValue.fxml [new file with mode: 0644]
plugins/junit/src/com/intellij/execution/ConfigurationUtil.java
plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/RepositoryLibraryDescriptor.java [new file with mode: 0644]
plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/JpsMavenModelSerializationExtension.java
plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/JpsMavenRepositoryLibraryType.java [new file with mode: 0644]
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/embedder/MavenExecutionResult.java
plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java
plugins/maven/maven32-server-impl/src/org/jetbrains/idea/maven/server/Maven32ServerEmbedderImpl.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryBean.java [new file with mode: 0644]
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryDescription.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryLibraryProperties.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/propertiesEditor/RepositoryLibraryPropertiesEditor.form
plugins/maven/src/main/resources/META-INF/plugin.xml
plugins/maven/src/main/resources/inspectionDescriptions/MavenDuplicateDependenciesInspection.html
plugins/maven/src/main/resources/inspectionDescriptions/MavenDuplicatePluginInspection.html
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/AddRepositoryLocationDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/ApplyPatchSaveToFileExecutor.java
plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java
plugins/terminal/lib/jediterm-pty-2.2.jar [moved from plugins/terminal/lib/jediterm-pty-2.1.jar with 66% similarity]
plugins/terminal/src/org/jetbrains/plugins/terminal/JBTabbedTerminalWidget.java
plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalView.java
plugins/terminal/terminal.iml
plugins/ui-designer/src/com/intellij/uiDesigner/clientProperties/ClientPropertiesManager.java
plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormSpellCheckingInspection.java
plugins/xpath/xpath-lang/gen/icons/XpathIcons.java [moved from plugins/xpath/xpath-lang/src/icons/XpathIcons.java with 64% similarity]
python/build/pycharm64_community_launcher.properties
python/build/pycharm_community_launcher.properties
python/educational-core/course-creator/resources/META-INF/plugin.xml
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCVirtualFileListener.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCEditTaskTextAction.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCTreeStructureProvider.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/settings/CCOptions.form
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/settings/CCOptions.java
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/settings/CCSettings.java
python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java
python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Task.java
python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java
python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java
python/educational-python/build/pycharm_edu_launcher.properties
python/helpers/pydev/_pydev_bundle/pydev_console_utils.py
python/helpers/pydev/_pydevd_bundle/pydevd_comm.py
python/helpers/pydev/_pydevd_bundle/pydevd_vars.py
python/openapi/src/com/jetbrains/python/packaging/PyRequirement.java
python/pydevSrc/com/jetbrains/python/debugger/ArrayChunk.java
python/pydevSrc/com/jetbrains/python/debugger/ArrayChunkBuilder.java [new file with mode: 0644]
python/pydevSrc/com/jetbrains/python/debugger/pydev/ProtocolParser.java
python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxRunConfiguration.java
python/resources/inspectionDescriptions/PyAttributeOutsideInitInspection.html
python/resources/inspectionDescriptions/PyCallByClassInspection.html
python/resources/inspectionDescriptions/PyDecoratorInspection.html
python/resources/inspectionDescriptions/PyDeprecationInspection.html
python/setup-test-environment/build.gradle
python/src/META-INF/python-core-common.xml
python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java
python/src/com/jetbrains/python/debugger/array/ArrayTableCellRenderer.java
python/src/com/jetbrains/python/debugger/array/ArrayTableForm.java [deleted file]
python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java
python/src/com/jetbrains/python/debugger/array/JBTableWithRowHeaders.java
python/src/com/jetbrains/python/debugger/array/NumpyArrayTable.java
python/src/com/jetbrains/python/debugger/array/TableChunkDatasource.java [new file with mode: 0644]
python/src/com/jetbrains/python/debugger/containerview/ColoredCellRenderer.java [new file with mode: 0644]
python/src/com/jetbrains/python/debugger/containerview/NumericContainerRendererForm.form [moved from python/src/com/jetbrains/python/debugger/array/ArrayTableForm.form with 92% similarity]
python/src/com/jetbrains/python/debugger/containerview/NumericContainerRendererForm.java [new file with mode: 0644]
python/src/com/jetbrains/python/debugger/containerview/NumericContainerViewTable.java [new file with mode: 0644]
python/src/com/jetbrains/python/debugger/containerview/PyNumericViewUtil.java [new file with mode: 0644]
python/src/com/jetbrains/python/debugger/containerview/PyViewNumericContainerAction.java [moved from python/src/com/jetbrains/python/debugger/array/PyViewArrayAction.java with 58% similarity]
python/src/com/jetbrains/python/debugger/containerview/ViewNumericContainerDialog.java [new file with mode: 0644]
python/src/com/jetbrains/python/debugger/dataframe/DataFrameTable.java [new file with mode: 0644]
python/src/com/jetbrains/python/debugger/dataframe/DataFrameTableCellRenderer.java [new file with mode: 0644]
python/src/com/jetbrains/python/debugger/dataframe/DataFrameTableModel.java [new file with mode: 0644]
python/src/com/jetbrains/python/debugger/dataframe/TableValueDescriptor.java [new file with mode: 0644]
python/src/com/jetbrains/python/documentation/docstrings/PyStructuredDocstringFormatter.java
python/src/com/jetbrains/python/facet/LibraryContributingFacet.java
python/src/com/jetbrains/python/inspections/PyPackageRequirementsInspection.java
python/src/com/jetbrains/python/inspections/quickfix/PyRenameElementQuickFix.java
python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
python/src/com/jetbrains/python/packaging/PyPackageUtil.java
python/src/com/jetbrains/python/packaging/setupPy/CreateSetupPyAction.java
python/src/com/jetbrains/python/packaging/setupPy/SetupTaskChooserAction.java
python/src/com/jetbrains/python/packaging/setupPy/SetupTaskIntrospector.java
python/src/com/jetbrains/python/refactoring/PyNameSuggestionProvider.java
python/src/com/jetbrains/python/refactoring/extractmethod/PyExtractMethodUtil.java
python/src/com/jetbrains/python/sdk/PySdkUtil.java
python/src/com/jetbrains/python/testing/PyIntegratedToolsProjectConfigurator.java
python/testData/debug/test_dataframe.py [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/AbsentRequirementsTxtReading/script.py [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/AbsentRequirementsTxtUpdating/script.py [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/AbsentSetupCallReading/setup.py [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/AbsentSetupCallUpdating/setup.py [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/AbsentSetupPyReading/script.py [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/AbsentSetupPyRequiresReading/setup.py [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/AbsentSetupPyUpdating/script.py [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/DistutilsSetupPyUpdating/setup.py [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/EmptyRequirementsTxtReading/requirements.txt [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/RequirementsTxtReading/requirements.txt [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/RequirementsTxtUpdating/requirements.txt [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/SetupPyDependencyLinksReading/setup.py [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/SetupPyReading/setup.py [new file with mode: 0644]
python/testData/packaging/PyPackageUtil/SetuptoolsSetupPyUpdating/setup.py [new file with mode: 0644]
python/testSrc/com/jetbrains/env/PyProcessWithConsoleTestTask.java
python/testSrc/com/jetbrains/env/PyToxTest.java
python/testSrc/com/jetbrains/env/python/PythonDataViewerTest.java [new file with mode: 0644]
python/testSrc/com/jetbrains/python/packaging/PyPackageUtilTest.java [new file with mode: 0644]
python/testSrc/com/jetbrains/python/packaging/PyRequirementTest.java
python/testSrc/com/jetbrains/python/testing/pytest/PyTestTracebackParserTest.java
resources-en/src/intentionDescriptions/ExpandStaticImportAction/description.html
resources-en/src/intentionDescriptions/IterateOverIterableIntention/description.html
resources/src/META-INF/IdeaPlugin.xml
resources/src/idea/JavaActions.xml
resources/src/idea/RichPlatformPlugin.xml
spellchecker/src/com/intellij/spellchecker/actions/SpellingPopupActionGroup.java
spellchecker/src/com/intellij/spellchecker/inspections/SpellCheckingInspection.java
spellchecker/src/com/intellij/spellchecker/jetbrains.dic
xml/impl/resources/intentionDescriptions/AddSchemaPrefixIntention/description.html
xml/impl/resources/intentionDescriptions/CollapseTagIntention/description.html
xml/impl/resources/intentionDescriptions/ConvertSchemaPrefixToDefaultIntention/description.html
xml/impl/src/com/intellij/psi/formatter/xml/SyntheticBlock.java
xml/impl/src/com/intellij/psi/formatter/xml/XmlFormattingPolicy.java
xml/impl/src/com/intellij/psi/formatter/xml/XmlPolicy.java
xml/impl/src/com/intellij/xml/arrangement/XmlRearranger.java
xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsInitializingActivity.java [moved from xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsLoaderComponent.java with 76% similarity]
xml/xml-analysis-impl/resources/inspectionDescriptions/XmlUnusedNamespaceDeclaration.html
xml/xml-psi-impl/src/com/intellij/lexer/XmlHighlightingLexer.java
xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex

index 3c4ab2bb40e147df6717a56af6477df936364780..33740962d245f8fa1238682b8a2e203d32bc9165 100644 (file)
@@ -4,11 +4,11 @@
       <root url="file://$PROJECT_DIR$/lib/annotations/netty"/>
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.0.CR7.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/netty-all-4.1.1.Final.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.0.CR7-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/netty-all-4.1.1.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
index 49401186e946c3c18c15eee3233ef31e7f75a041..6ff8d23d1170a530b118c096577b85829e2ad544 100644 (file)
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="pty4j">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/pty4j-0.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/pty4j-0.7.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/pty4j-0.6-src.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/pty4j-0.7-src.jar!/" />
     </SOURCES>
   </library>
 </component>
index 7f1da1937ee428462f05225a4d834e89882316da..0edb7c40d12df8c817ca3bd0b97f4dc24143f1ab 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -17,8 +17,8 @@ package org.intellij.lang.regexp;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.documentation.AbstractDocumentationProvider;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
-import org.intellij.lang.regexp.psi.RegExpElement;
 import org.intellij.lang.regexp.psi.RegExpGroup;
 import org.intellij.lang.regexp.psi.RegExpProperty;
 import org.jetbrains.annotations.Nullable;
@@ -47,10 +47,12 @@ public final class RegExpDocumentationProvider extends AbstractDocumentationProv
     return null;
   }
 
+  @Override
   @Nullable
   public String getQuickNavigateInfo(PsiElement element, PsiElement originalElement) {
     if (element instanceof RegExpGroup) {
-      return "Capturing Group: " + ((RegExpElement)element).getUnescapedText();
+      final RegExpGroup group = (RegExpGroup)element;
+      return StringUtil.escapeXml(group.getUnescapedText());
     } else {
       return null;
     }
index 1155e09ce160c7db87bc8a78ec920e2235965e8f..c530f61e03dd7463f15adde43697d6b499c3d304 100644 (file)
  */
 package org.intellij.lang.regexp;
 
-import org.intellij.lang.regexp.psi.RegExpChar;
-import org.intellij.lang.regexp.psi.RegExpGroup;
-import org.intellij.lang.regexp.psi.RegExpNamedGroupRef;
-import org.intellij.lang.regexp.psi.RegExpSimpleClass;
+import com.intellij.psi.PsiElement;
+import org.intellij.lang.regexp.psi.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -42,6 +40,10 @@ public interface RegExpLanguageHost {
     return true;
   }
 
+  default boolean supportsInlineOptionFlag(char flag, PsiElement context) {
+    return true;
+  }
+
   boolean isValidCategory(@NotNull String category);
   @NotNull
   String[][] getAllKnownProperties();
index 71ac84ef0138bea1a0d236af624d1f7e8ae19d9f..2d3bd894144c9c15827684d46dda5348e269a628 100644 (file)
@@ -81,6 +81,11 @@ public final class RegExpLanguageHosts extends ClassExtension<RegExpLanguageHost
     }
   }
 
+  public boolean supportsInlineOptionFlag(char flag, PsiElement context) {
+    final RegExpLanguageHost host = findRegExpHost(context);
+    return host == null || host.supportsInlineOptionFlag(flag, context);
+  }
+
   public boolean supportsExtendedHexCharacter(@Nullable RegExpChar regExpChar) {
     final RegExpLanguageHost host = findRegExpHost(regExpChar);
     try {
index 9029a33969fc884de7d79f4fcfa04e0144eff7f9..e0196cb1b26cc21627baf0cffbe76c18bf649ba9 100644 (file)
@@ -1,92 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.intellij.lang.regexp.intention.CheckRegExpForm">
-  <grid id="a29f0" binding="myRootPanel" custom-create="true" layout-manager="BorderLayout" hgap="0" vgap="0">
+  <grid id="38faf" binding="myRootPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="376" height="134"/>
+      <xy x="20" y="20" width="376" height="163"/>
     </constraints>
     <properties/>
-    <border type="empty">
-      <size top="0" left="1" bottom="0" right="1"/>
-    </border>
+    <border type="none"/>
     <children>
-      <grid id="c2a42" layout-manager="BorderLayout" hgap="0" vgap="0">
-        <constraints border-constraint="Center"/>
+      <component id="5de69" class="com.intellij.ui.components.JBLabel" binding="myMessage">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <componentStyle value="SMALL"/>
+          <text value="Red means I can't hear you!"/>
+        </properties>
+      </component>
+      <vspacer id="dd293">
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </vspacer>
+      <component id="b01c9" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <preferredSize width="55" height="16"/>
+          <text value="RegExp:"/>
+        </properties>
+      </component>
+      <component id="ec7ec" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <preferredSize width="55" height="16"/>
+          <text value="Sample:"/>
+        </properties>
+      </component>
+      <component id="d8697" class="com.intellij.ui.EditorTextField" binding="myRegExp" custom-create="true">
+        <constraints>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
         <properties/>
-        <border type="none"/>
-        <children>
-          <grid id="a052" layout-manager="BorderLayout" hgap="0" vgap="0">
-            <constraints border-constraint="Center"/>
-            <properties/>
-            <border type="empty">
-              <size top="5" left="5" bottom="10" right="5"/>
-            </border>
-            <children>
-              <grid id="b7b2b" layout-manager="BorderLayout" hgap="0" vgap="0">
-                <constraints border-constraint="North"/>
-                <properties/>
-                <border type="none"/>
-                <children>
-                  <component id="d8697" class="com.intellij.ui.EditorTextField" binding="myRegExp" custom-create="true">
-                    <constraints border-constraint="Center"/>
-                    <properties/>
-                  </component>
-                  <component id="b01c9" class="javax.swing.JLabel">
-                    <constraints border-constraint="West"/>
-                    <properties>
-                      <alignmentX value="1.0"/>
-                      <preferredSize width="55" height="16"/>
-                      <text value="RegExp:"/>
-                    </properties>
-                  </component>
-                </children>
-              </grid>
-              <grid id="aab68" layout-manager="BorderLayout" hgap="0" vgap="0">
-                <constraints border-constraint="Center"/>
-                <properties/>
-                <border type="none"/>
-                <children>
-                  <component id="47807" class="com.intellij.ui.EditorTextField" binding="mySampleText" custom-create="true">
-                    <constraints border-constraint="Center"/>
-                    <properties/>
-                  </component>
-                  <component id="ec7ec" class="javax.swing.JLabel">
-                    <constraints border-constraint="West"/>
-                    <properties>
-                      <alignmentX value="1.0"/>
-                      <alignmentY value="0.0"/>
-                      <preferredSize width="55" height="16"/>
-                      <text value="Sample:"/>
-                    </properties>
-                  </component>
-                </children>
-              </grid>
-            </children>
-          </grid>
-          <grid id="fff6d" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-            <margin top="0" left="0" bottom="0" right="0"/>
-            <constraints border-constraint="South"/>
-            <properties/>
-            <border type="none"/>
-            <children>
-              <component id="5de69" class="com.intellij.ui.components.JBLabel" binding="myMessage">
-                <constraints>
-                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <alignmentX value="0.5"/>
-                  <componentStyle value="SMALL"/>
-                  <text value="Red means I can't hear you!"/>
-                </properties>
-              </component>
-              <hspacer id="c8c90">
-                <constraints>
-                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-                </constraints>
-              </hspacer>
-            </children>
-          </grid>
-        </children>
-      </grid>
+      </component>
+      <component id="47807" class="com.intellij.ui.EditorTextField" binding="mySampleText" custom-create="true">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+      </component>
     </children>
   </grid>
 </form>
index 925d37ba3d59b2c1e749be25607ac881a1996cf4..51fc4578920001a6185745c7f697aa519b94d16f 100644 (file)
@@ -21,14 +21,17 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CustomShortcutSet;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.editor.event.DocumentEvent;
+import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.fileTypes.PlainTextFileType;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.popup.Balloon;
+import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.IdeFocusManager;
@@ -37,7 +40,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiLanguageInjectionHost;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 import com.intellij.ui.EditorTextField;
-import com.intellij.ui.Gray;
 import com.intellij.ui.JBColor;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.util.Alarm;
@@ -49,8 +51,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 
 import javax.swing.*;
-import javax.swing.border.CompoundBorder;
-import javax.swing.border.LineBorder;
 import java.awt.*;
 import java.util.regex.Pattern;
 
@@ -82,12 +82,17 @@ public class CheckRegExpForm {
     Document document = PsiDocumentManager.getInstance(myProject).getDocument(myRegexpFile);
 
     myRegExp = new EditorTextField(document, myProject, RegExpLanguage.INSTANCE.getAssociatedFileType());
-    myRegExp.setPreferredWidth(Math.max(JBUI.scale(300), myRegExp.getPreferredSize().width));
     final String sampleText = PropertiesComponent.getInstance(myProject).getValue(LAST_EDITED_REGEXP, "Sample Text");
-    mySampleText = new EditorTextField(sampleText, myProject, PlainTextFileType.INSTANCE);
-    mySampleText.setBorder(
-      new CompoundBorder(JBUI.Borders.empty(2, 2, 2, 4), new LineBorder(UIUtil.isUnderDarcula() ? Gray._100 : JBColor.border())));
+    mySampleText = new EditorTextField(sampleText, myProject, PlainTextFileType.INSTANCE) {
+      @Override
+      protected void updateBorder(@NotNull EditorEx editor) {
+        setupBorder(editor);
+      }
+    };
     mySampleText.setOneLineMode(false);
+    int preferredWidth = Math.max(JBUI.scale(250), myRegExp.getPreferredSize().width);
+    myRegExp.setPreferredWidth(preferredWidth);
+    mySampleText.setPreferredWidth(preferredWidth);
 
     myRootPanel = new JPanel(new BorderLayout()) {
       Disposable disposable;
@@ -112,7 +117,7 @@ public class CheckRegExpForm {
           public void documentChanged(DocumentEvent e) {
             updater.cancelAllRequests();
             if (!updater.isDisposed()) {
-              updater.addRequest(() -> updateBalloon(), 200);
+              updater.addRequest(CheckRegExpForm.this::updateBalloon, 200);
             }
           }
         };
@@ -130,6 +135,7 @@ public class CheckRegExpForm {
         PropertiesComponent.getInstance(myProject).setValue(LAST_EDITED_REGEXP, mySampleText.getText());
       }
     };
+    myRootPanel.setBorder(JBUI.Borders.empty(UIUtil.DEFAULT_VGAP, UIUtil.DEFAULT_HGAP));
   }
 
   @NotNull
@@ -149,7 +155,9 @@ public class CheckRegExpForm {
       mySampleText.setBackground(correct != null && correct ? BACKGROUND_COLOR_MATCH : BACKGROUND_COLOR_NOMATCH);
       myMessage.setText(correct == null ? "Pattern is too complex" : correct ? "Matches!" : "No match");
       myRootPanel.revalidate();
-    }, o -> false);
+      Balloon balloon = JBPopupFactory.getInstance().getParentBalloonFor(myRootPanel);
+      if (balloon != null) balloon.revalidate();
+    }, ModalityState.current());
   }
 
   @TestOnly
index 6da84caa56ec6bbfc5101f41662143da04ccdb7f..aee165a4db8c33389cd443658d627e8fc5e8daee 100644 (file)
@@ -16,7 +16,9 @@
 package org.intellij.lang.regexp.intention;
 
 import com.intellij.codeInsight.intention.impl.QuickEditAction;
+import com.intellij.codeInsight.intention.impl.QuickEditHandler;
 import com.intellij.lang.Language;
+import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
@@ -26,6 +28,7 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.util.IncorrectOperationException;
 import org.intellij.lang.regexp.RegExpLanguage;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,7 +47,19 @@ public class CheckRegExpIntentionAction extends QuickEditAction implements Icona
       Language language = pair.first.getLanguage();
       return language.isKindOf(RegExpLanguage.INSTANCE);
     }
-    return false;
+    PsiFile baseFile = InjectedLanguageManager.getInstance(project).getTopLevelFile(file);
+    return baseFile != null && baseFile.getLanguage().isKindOf(RegExpLanguage.INSTANCE);
+  }
+
+  @Override
+  public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+    PsiFile baseFile = InjectedLanguageManager.getInstance(project).getTopLevelFile(file);
+    if (baseFile == null || !baseFile.getLanguage().isKindOf(RegExpLanguage.INSTANCE)) {
+      super.invoke(project, editor, file);
+      return;
+    }
+    JComponent component = createBalloonComponent(file);
+    if (component != null) QuickEditHandler.showBalloon(editor, file, component);
   }
 
   @Override
index cd03b9e79b0cf54193c0b486f03e8331d178041a..53cb6f3cf5bc9f34759917944247cc1a1edc2773 100644 (file)
@@ -16,7 +16,6 @@
 package org.intellij.lang.regexp.psi;
 
 import com.intellij.psi.PsiElementVisitor;
-import org.intellij.lang.regexp.psi.impl.RegExpOptionsImpl;
 
 public class RegExpElementVisitor extends PsiElementVisitor {
 
@@ -43,7 +42,7 @@ public class RegExpElementVisitor extends PsiElementVisitor {
         visitRegExpElement(group);
     }
 
-    public void visitRegExpOptions(RegExpOptionsImpl options) {
+    public void visitRegExpOptions(RegExpOptions options) {
         visitRegExpElement(options);
     }
 
index dc927f1a7613773b9f9ec834fa0a3075d6c3e863..f29d10fd718e45b7fd4080925a3d282cbb1683ae 100644 (file)
  */
 package org.intellij.lang.regexp.psi;
 
+import com.intellij.lang.ASTNode;
+import org.jetbrains.annotations.Nullable;
+
 /**
  * Represents an inline options element (?x) or (?-x). Returned from {@link org.intellij.lang.regexp.psi.RegExpSetOptions}
  */
 public interface RegExpOptions extends RegExpElement {
     /**
-     * Checks whether a certain option is set.
+     * @param flag  the flag to check, e.g. 'i'
+     * @return true, when the specified flag is switched on, false otherwise.
      */
-    boolean isSet(char option);
+    boolean isSwitchedOn(char flag);
+
+  /**
+   * It's possible for a flag to be both switched on and switched off.
+   * @param flag  the flag to check, e.g. 'd'
+   * @return true, when the specified flag is switched off, false otherwise.
+   */
+    boolean isSwitchedOff(char flag);
+
+    @Nullable
+    ASTNode getOptionsOn();
+
+    @Nullable
+    ASTNode getOptionsOff();
 }
index 46022bfde2a43eeb645b89ed0168bcfda20a845a..a557702b83e9eb107db67968b7595aba2fa88897 100644 (file)
@@ -17,19 +17,42 @@ package org.intellij.lang.regexp.psi.impl;
 
 import com.intellij.lang.ASTNode;
 
+import org.intellij.lang.regexp.RegExpTT;
 import org.intellij.lang.regexp.psi.RegExpElementVisitor;
 import org.intellij.lang.regexp.psi.RegExpOptions;
+import org.jetbrains.annotations.Nullable;
 
 public class RegExpOptionsImpl extends RegExpElementImpl implements RegExpOptions {
     public RegExpOptionsImpl(ASTNode astNode) {
         super(astNode);
     }
 
+    @Override
     public void accept(RegExpElementVisitor visitor) {
         visitor.visitRegExpOptions(this);
     }
 
-    public boolean isSet(char option) {
-        return getUnescapedText().indexOf(option) != -1;
+    @Override
+    public boolean isSwitchedOn(char flag) {
+        final ASTNode node = getOptionsOn();
+        return node != null && node.getText().indexOf(flag) >= 0;
+    }
+
+    @Override
+    public boolean isSwitchedOff(char flag) {
+        final ASTNode node = getOptionsOff();
+        return node != null && node.getText().indexOf(flag) > 0;
+    }
+
+    @Override
+    @Nullable
+    public ASTNode getOptionsOn() {
+        return getNode().findChildByType(RegExpTT.OPTIONS_ON);
+    }
+
+    @Override
+    @Nullable
+    public ASTNode getOptionsOff() {
+        return getNode().findChildByType(RegExpTT.OPTIONS_OFF);
     }
 }
index 1323e44d18e40c7d9bb4c3c20f72d83a37df3cb5..7817c1e08ce8877f6ca5d7a9df6ce556672e66f8 100644 (file)
@@ -30,6 +30,7 @@ import org.intellij.lang.regexp.RegExpLanguageHosts;
 import org.intellij.lang.regexp.RegExpTT;
 import org.intellij.lang.regexp.psi.*;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.math.BigInteger;
 import java.util.HashSet;
@@ -58,6 +59,27 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot
     }
   }
 
+  @Override
+  public void visitRegExpOptions(RegExpOptions options) {
+    checkValidFlag(options.getOptionsOn(), options);
+    checkValidFlag(options.getOptionsOff(), options);
+  }
+
+  private void checkValidFlag(@Nullable ASTNode optionsNode, @NotNull RegExpOptions context) {
+    if (optionsNode == null) {
+      return;
+    }
+    final String text = optionsNode.getText();
+    final int start = (optionsNode.getElementType() == RegExpTT.OPTIONS_OFF) ? 1 : 0; // skip '-' if necessary
+    for (int i = start, length = text.length(); i < length; i++) {
+      final int c = text.codePointAt(i);
+      if (!Character.isBmpCodePoint(c) || !myLanguageHosts.supportsInlineOptionFlag((char)c, context)) {
+        final int offset = optionsNode.getStartOffset() + i;
+        myHolder.createErrorAnnotation(new TextRange(offset, offset + 1), "Unknown inline option flag");
+      }
+    }
+  }
+
   @Override
   public void visitRegExpCharRange(RegExpCharRange range) {
     final RegExpCharRange.Endpoint from = range.getFrom();
index 7aa0738945220579f46b1f2345f33fb665a3ce4e..d9a06ed1fb33fabc9e282f0b57df8e7bf13804d7 100644 (file)
@@ -103,6 +103,10 @@ public class RegExpParseTest extends BaseParseTestCase {
     return super.getTestDataPath() + "/gen/";
   }
 
+  public void testOptions() throws Exception {
+    doTest("options/");
+  }
+
   public void testSimple() throws Exception {
     doTest("simple/");
   }
index 3e81b2ec2e897edb79b503c1cdac9d45e573eabd..12ec11dbd6e312f1bd544dc6151293f0e5dacaad 100644 (file)
     </test>
   </regressions>
 
+  <options>
+    <test host="com.intellij.psi.impl.JavaRegExpHost">
+      <pattern><![CDATA[(?i<error descr="Unknown inline option flag">Z</error>m)abc]]></pattern>
+      <expected>OK</expected>
+    </test>
+    <test host="com.intellij.psi.impl.JavaRegExpHost">
+      <pattern>(?idmsuxU)nice</pattern>
+      <expected>OK</expected>
+    </test>
+    <test host="com.intellij.psi.impl.JavaRegExpHost">
+      <pattern verify="false">(?idm-suxU)one(?suxU-idm)two</pattern>
+      <expected>OK</expected>
+    </test>
+  </options>
+
   <test>
     <pattern>abc)</pattern>
     <expected>ERR</expected>
index 1a8c9effc739cd8de75db2c4b48a9e139d4de946..8b500d2ad95f71b54873d4356334f880884a32f4 100644 (file)
Binary files a/bin/WinLauncher/WinLauncher.exe and b/bin/WinLauncher/WinLauncher.exe differ
index a324ccae5842a59bfcc39d0f61f61173cfe8aa91..0dc7d05fb86947792ab3f2448b7c05f3efa443c2 100644 (file)
Binary files a/bin/WinLauncher/WinLauncher64.exe and b/bin/WinLauncher/WinLauncher64.exe differ
index ce5974673e5bc449972fa535be001aa35bbbd224..347800cd59300e8205905241eda555f3e9ac7c55 100755 (executable)
@@ -11,7 +11,7 @@ message()
   if [ -n "`which zenity`" ]; then
     zenity --error --title="$TITLE" --text="$1"
   elif [ -n "`which kdialog`" ]; then
-    kdialog --error --title "$TITLE" "$1"
+    kdialog --error "$1" --title "$TITLE"
   elif [ -n "`which xmessage`" ]; then
     xmessage -center "ERROR: $TITLE: $1"
   elif [ -n "`which notify-send`" ]; then
index 6cafa4358b0d00d24690e23d7adcc200279e686b..ae4aeae025f6fb329c68620f30f01e7c675d2307 100644 (file)
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-162.SNAPSHOT
+163.SNAPSHOT
index 904a0a1360924ed92e479349cc0c2275ea2f608f..cc001f078cb78e680395e6345b247608d03508e9 100644 (file)
@@ -1,8 +1,10 @@
 IDS_JDK_ONLY=true
 IDS_APP_TITLE=__IDE-NAME__ Launcher
 IDS_VM_OPTIONS_PATH=%USERPROFILE%\\.__PRODUCT_PATHS_SELECTOR__
+IDS_VM_OPTION_ERRORFILE=-XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log
+IDS_VM_OPTION_HEAPDUMPPATH=-XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof
 IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
 IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
 IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME___VM_OPTIONS
 IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
-IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log -XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof -Didea.jre.check=true
+IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -Didea.jre.check=true
index cb79dba4c71c1cb9e6f9bbe779f5f2865943eaf0..aae51c0ecf9c69e5220f0696f3df7ce387af9bb2 100644 (file)
@@ -2,8 +2,10 @@ IDS_JDK_ONLY=true
 IDS_JDK_ENV_VAR=IDEA_JDK_64
 IDS_APP_TITLE=__IDE-NAME__ Launcher
 IDS_VM_OPTIONS_PATH=%USERPROFILE%\\.__PRODUCT_PATHS_SELECTOR__
+IDS_VM_OPTION_ERRORFILE=-XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log
+IDS_VM_OPTION_HEAPDUMPPATH=-XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof
 IDC_WINLAUNCHER=__IDE-NAME___LAUNCHER
 IDS_PROPS_ENV_VAR=__IDE-NAME___PROPERTIES
 IDS_VM_OPTIONS_ENV_VAR=__IDE-NAME__64_VM_OPTIONS
 IDS_ERROR_LAUNCHING_APP=Error launching __IDE-NAME__
-IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -XX:ErrorFile=%USERPROFILE%\\java_error_in___product_uc___%p.log -XX:HeapDumpPath=%USERPROFILE%\\java_error_in___product_uc__.hprof -Didea.jre.check=true
+IDS_VM_OPTIONS=-Didea.paths.selector=__PRODUCT_PATHS_SELECTOR__ -Didea.jre.check=true
index b909147e689d9816eb972ea361c664de2db08ec0..227963c90c4ee4eaeb2c099c00c33907bd92029f 100644 (file)
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import com.intellij.openapi.util.SystemInfo
 
 import java.util.regex.Pattern
@@ -29,8 +28,17 @@ target('default': 'Downloads custom JRE build from Teamcity server') {
     echo "Acceptable architecture (32 or 64 bit) is not defined, JRE download skipped"
     return
   }
-  def buildId = new URL("$jreTeamcityUrl/buildTypes/id:$jreBuildTypeId/builds/tags:$jreBuildTag/id").text
-  def buildNumber = new URL("$jreTeamcityUrl/builds/id:$buildId/number").text
+
+  String buildId, buildNumber
+  try {
+    buildId = new URL("$jreTeamcityUrl/buildTypes/id:$jreBuildTypeId/builds/tags:$jreBuildTag/id").text
+    buildNumber = new URL("$jreTeamcityUrl/builds/id:$buildId/number").text
+  }
+  catch (IOException e) {
+    echo "Build server connection failed: ${e.message}, JRE download skipped"
+    return
+  }
+
   java(jvm: SystemInfo.isMac ? "$workIdeaHome/jre/jdk/Contents/Home/jre/bin/java" : "$workIdeaHome/jre/jre/bin/java",
        fork: "true", classname: "dummy", outputproperty: "jvmVersionOutput") {
     jvmarg(value: "-version")
index b641246b513883e4aec779f7e25b33da551eb0b0..7bf7a630f30033aee25767d87501933b16b84979 100644 (file)
@@ -27,7 +27,7 @@ import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome
 
 includeTargets << new File("${guessHome(this)}/build/scripts/utils.gant")
 
-String kotlinBuildConfigurationOnPublicTeamCity = "Kotlin_101andRc_Idea142branch150versionNoTests"
+String kotlinBuildConfigurationOnPublicTeamCity = "Kotlin_102_Idea145branch160versionNoTests"
 
 target('default': 'Ensures that build/kotlinc directory contains JARs from Kotlin plugin compatible with current IDEA sources. These JARs are used by build scripts.') {
   def communityHome = guessHome(this)
index e7d1bd41f2a31b0fb0a5922bdb7b48e9573f45a4..0f19c810fe799b7162b27665f68d730640124c83 100644 (file)
@@ -162,7 +162,7 @@ libraryLicense(name: "ANTLR 4 Runtime", libraryName: "antlr-runtime-4.1.jar", ve
 libraryLicense(name: "Antlr", libraryName: "antlr.jar", version: "3.4", license: "BSD", url: "http://www.antlr.org", licenseUrl: "http://www.antlr.org/license.html")
 libraryLicense(name: "Apache Commons BeanUtils", libraryName: "commons-beanutils.jar", version: "1.6", license: "Apache 2.0", url: "http://commons.apache.org/beanutils/")
 libraryLicense(name: "Apache Commons Codec", libraryName: "commons-codec", version: "1.8", license: "Apache 2.0", url: "http://commons.apache.org/codec/", licenseUrl: "http://www.apache.org/licenses/")
-libraryLicense(name: "Apache Commons Compress", libraryName: "commons-compress-android", version: "1.0", license: "Apache 2.0", url: "http://commons.apache.org/proper/commons-compress/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
+libraryLicense(name: "Apache Commons Compress", libraryName: "commons-compress", version: "1.10", license: "Apache 2.0", url: "http://commons.apache.org/proper/commons-compress/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "Apache Commons Discovery", libraryName: "commons-discovery-0.4.jar", version: "0.4", license: "Apache 2.0", url: "http://jakarta.apache.org/commons/discovery/", licenseUrl: "http://www.apache.org/licenses/")
 libraryLicense(name: "Apache Commons HTTPClient", libraryName: "http-client-3.1", version: "3.1&nbsp; (with patch by JetBrains)", license: "Apache 2.0", url: "http://hc.apache.org/httpclient-3.x")
 libraryLicense(name: "Apache Commons IO", libraryName: "commons-io-1.4.jar", version: "1.4", license: "Apache 2.0", url: "http://commons.apache.org/io/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt")
@@ -227,7 +227,7 @@ libraryLicense(name: "Jaxen", version: "", license: "modified Apache", url: "htt
 libraryLicense(name: "jayatana", libraryName: "jayatana", version: "1.2.4", license: "MIT License", url: "https://code.google.com/p/java-swing-ayatana/", licenseUrl: "http://opensource.org/licenses/mit-license.php")
 libraryLicense(name: "JCIP Annotations", libraryName: "jcip", license: "Creative Commons Attribution License", url: "http://www.jcip.net", licenseUrl: "http://creativecommons.org/licenses/by/2.5")
 libraryLicense(name: "JDOM", version: "1.1 (with patches by JetBrains)", license: "modified Apache", url: "http://www.jdom.org/", licenseUrl: "http://www.jdom.org/docs/faq.html#a0030")
-libraryLicense(name: "JediTerm", libraryName: "jediterm-pty", version: "0.2", license: "LGPL 2", url: "https://github.com/traff/jediterm", licenseUrl: "https://github.com/traff/jediterm/blob/master/COPYING")
+libraryLicense(name: "JediTerm", libraryName: "jediterm-pty", version: "2.2", license: "LGPL 2", url: "https://github.com/JetBrains/jediterm", licenseUrl: "https://github.com/JetBrains/jediterm/blob/master/COPYING")
 libraryLicense(name: "JEuclid", libraryName: "jeuclid-core-3.1.9.jar", version: "3.1.9", license: "Apache 2.0", url: "http://jeuclid.sourceforge.net", licenseUrl:"http://sourceforge.net/p/jeuclid/code/ci/default/tree/LICENSE.txt")
 libraryLicense(name: "JGit", libraryName: "jackson", version: "2.5.1", license: "Apache 2.0", licenseUrl: "http://www.eclipse.org/org/documents/edl-v10.php", url: "https://github.com/FasterXML/jackson")
 libraryLicense(name: "JGit", libraryName: "jgit", version: "4.0", license: "Eclipse Distribution License 1.0", licenseUrl: "http://www.eclipse.org/org/documents/edl-v10.php", url: "https://eclipse.org/jgit/")
@@ -279,7 +279,7 @@ libraryLicense(name: "Plexus Utils", libraryName: "plexus-utils-1.5.5.jar", vers
 libraryLicense(name: "pockets", attachedTo: "python-helpers", version: "0.2.4", license: "BSD", url: "http://pockets.readthedocs.org/")
 libraryLicense(name: "protobuf", version: "2.5.0", license: "New BSD", url: "http://code.google.com/p/protobuf/", licenseUrl: "https://github.com/google/protobuf/blob/master/LICENSE")
 libraryLicense(name: "proxy-vole", libraryName: "proxy-vole", version: "20131209", license: "New BSD License", url: "http://code.google.com/p/proxy-vole/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
-libraryLicense(name: "pty4j", libraryName: "pty4j", version: "0.6", license: "Eclipse Public License v1.0", url: "https://github.com/traff/pty4j")
+libraryLicense(name: "pty4j", libraryName: "pty4j", version: "0.7", license: "Eclipse Public License v1.0", url: "https://github.com/traff/pty4j")
 libraryLicense(name: "PureJavaComm", libraryName: "purejavacomm", version: "0.0.16", license: "BSD", url: "http://www.sparetimelabs.com/purejavacomm")
 libraryLicense(name: "ReflectASM", libraryName: "reflectasm-1.0.7.jar", version: "1.0.7", license: "BSD", url: "https://github.com/EsotericSoftware/reflectasm", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
 libraryLicense(name: "Relax NG Object Model", libraryName: "rngom-20051226-patched.jar", license: "MIT", url: "http://java.net/projects/rngom/", licenseUrl: "http://www.opensource.org/licenses/mit-license.php")
index a78f5cae00fd2a4cb4d6ae0d5271aa6fd6c97ab8..731a5c8e8af05291e096e208b0cb1c443f8b0305 100644 (file)
@@ -1,5 +1,5 @@
 <component>
-  <version codename="Community Edition" major="2016" minor="2" eap="true"/>
+  <version codename="Community Edition" major="2016" minor="3" eap="true"/>
   <company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE"/>
   <build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
   <logo url="/idea_community_logo.png" textcolor="444444" progressColor="f87206" progressX="0" progressY="271" progressHeight="3" licenseOffsetY="30" />
index 87061ca3964e54042cffc061b09d130887aa7f7d..05e559eb7488686840b819164734d6a1bdd58da8 100644 (file)
@@ -4,7 +4,7 @@
 
   <extensions defaultExtensionNs="com.intellij">
     <search.topHitProvider implementation="org.intellij.images.options.impl.ImagesOptionsTopHitProvider"/>
-    <applicationConfigurable groupId="editor" instance="org.intellij.images.options.impl.OptionsConfigurabe" id="Images" displayName="Images"/>
+    <applicationConfigurable groupId="editor" instance="org.intellij.images.options.impl.ImagesConfigurable" id="Images" displayName="Images"/>
     <fileEditorProvider implementation="org.intellij.images.editor.impl.ImageFileEditorProvider"/>
     <selectInTarget implementation="org.intellij.images.thumbnail.impl.ThumbnailSelectInTarget"/>
 
@@ -19,7 +19,7 @@
     <fileLookupInfoProvider implementation="org.intellij.images.completion.ImageLookupInfoProvider"/>
     <documentationProvider implementation="org.intellij.images.fileTypes.ImageDocumentationProvider"/>
 
-    <statistics.usagesCollector implementation="org.intellij.images.statistics.BackgroundUsageCollector"/>
+    <statistics.usagesCollector implementation="org.intellij.images.statistics.BackgroundImagesUsageCollector"/>
   </extensions>
 
   <actions>
index 49d885ab9a3d157ebe0ba33e33487e22ed00fc1c..d7e636822d646cbb6d4b167dbb98beaa4edde978 100644 (file)
--- a/