Merge remote-tracking branch 'origin/master' into mark_folder_as appcode/144.1326 clion/144.1328
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 20 Nov 2015 19:56:31 +0000 (20:56 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 20 Nov 2015 19:56:31 +0000 (20:56 +0100)
794 files changed:
.idea/externalDependencies.xml
build/conf/nsis/idea.nsi
build/conf/nsis/registry.nsi
build/gant.xml
build/scripts/download_kotlin.gant
build/scripts/utils.gant
build/update.xml
community-resources/src/idea/IdeaApplicationInfo.xml
community-resources/src/idea_community_about.png
community-resources/src/idea_community_about@2x.png
community-resources/src/idea_community_logo.png
community-resources/src/idea_community_logo@2x.png
images/src/org/intellij/images/editor/impl/ImageEditorUI.java
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
java/compiler/instrumentation-util/src/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenter.java
java/compiler/javac2/src/com/intellij/ant/Javac2.java
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MethodEvaluator.java
java/execution/impl/src/com/intellij/execution/application/ApplicationRunLineMarkerProvider.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaPsiUtil.java
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java
java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java
java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/FieldFromParameterUtils.java
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java
java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
java/java-psi-api/src/com/intellij/codeInsight/AnnotationTargetUtil.java
java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
java/java-psi-api/src/com/intellij/psi/PsiIntersectionType.java
java/java-psi-api/src/com/intellij/psi/PsiNameHelper.java
java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java
java/java-psi-api/src/com/intellij/psi/util/PropertyUtil.java
java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
java/java-psi-api/src/com/intellij/psi/util/RedundantCastUtil.java
java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java
java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSessionContainer.java [new file with mode: 0644]
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/LambdaExpressionCompatibilityConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
java/java-tests/java-tests.iml
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/DoNotIgnoreConflictingUpperBounds.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/AClass.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/AssignedButUnreadField.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/BackError.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/ChangeXmlIncludeLeadsToRehighlight.xml [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/ChangeXmlIncludeLeadsToRehighlight.xsd [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/Error.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/ErrorMark.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/ErrorMarkAtEnd.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/FieldCanBeLocal.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/HighlightersUpdate.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/LineMarkerChange.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/OverriddenMethodMarkers.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/QuickFixes.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/RehighlightInnerBlockAfterInline.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/typing/UnusedField.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/generateConstructor/afterTypeAnnotatedField.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/generateConstructor/beforeTypeAnnotatedField.java [new file with mode: 0644]
java/java-tests/testData/compiler/notNullVerification/MalformedBytecode.java [new file with mode: 0644]
java/java-tests/testData/inspection/dataFlow/NotNullLocalVariable/expected.xml
java/java-tests/testData/inspection/dataFlow/fixture/MethodParametersCanChangeNullability.java [new file with mode: 0644]
java/java-tests/testData/projectView/packageView/src/com/package1/emptyClassFile.class [new file with mode: 0644]
java/java-tests/testData/psi/resolve/Thinlet.java [new file with mode: 0644]
java/java-tests/testData/psi/resolve/ThinletBig.java [new file with mode: 0644]
java/java-tests/testData/psi/resolve/ant/build.xml [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/codeInsight/GenerateConstructorTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspection8Test.java
java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTestCase.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisResultsHighlightingTest.java
java/java-tests/testSrc/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenterTest.java
java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
java/java-tests/testSrc/com/intellij/projectView/PackagesTreeStructureTest.java
java/java-tests/testSrc/com/intellij/psi/resolve/ResolvePerformanceTest.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
java/manifest/src/org/jetbrains/lang/manifest/ManifestBundle.properties
java/manifest/src/org/jetbrains/lang/manifest/header/impl/ClassReferenceParser.java
java/manifest/src/org/jetbrains/lang/manifest/header/impl/StandardManifestHeaderParsers.java
java/manifest/test/org/jetbrains/lang/manifest/ManifestHighlightingTest.java
java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScope.java
jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/NotNullInstrumentingBuilder.java
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
jps/jps-builders/src/org/jetbrains/jps/javac/ExternalJavacManager.java
jps/jps-builders/testSrc/org/jetbrains/jps/builders/CompileScopeTestBuilder.java
jps/model-api/src/org/jetbrains/jps/service/SharedThreadPool.java
jps/model-impl/src/org/jetbrains/jps/service/impl/SharedThreadPoolImpl.java
jps/model-serialization/src/org/jetbrains/jps/model/serialization/java/compiler/AnnotationProcessorProfileSerializer.java
platform/annotations/common/src/org/jetbrains/annotations/Nls.java
platform/annotations/common/src/org/jetbrains/annotations/NonNls.java
platform/configuration-store-impl/src/ComponentStoreImpl.kt
platform/configuration-store-impl/src/ProjectStoreImpl.kt
platform/configuration-store-impl/src/StateStorageManagerImpl.kt
platform/core-api/src/com/intellij/lang/LanguageUtil.java
platform/core-api/src/com/intellij/psi/SyntaxTraverser.java
platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
platform/core-impl/src/com/intellij/lang/WhitespacesBinders.java
platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/CoreJarFileSystem.java
platform/core-impl/src/com/intellij/psi/impl/source/text/BlockSupportImpl.java
platform/core-impl/src/com/intellij/psi/impl/source/tree/ChangeUtil.java
platform/core-impl/src/com/intellij/psi/impl/source/tree/TreeGenerator.java
platform/core-impl/src/com/intellij/util/DebugReflectionUtil.java
platform/diff-impl/src/com/intellij/diff/comparison/ByLine.java
platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java
platform/diff-impl/src/com/intellij/diff/tools/util/base/ListenerDiffViewerBase.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/ChangeCompareModeAction.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/ChangeCompareModeGroup.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffAction.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/popup/SetNoOperation.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/popup/SetOperationToBase.java
platform/diff-impl/tests/com/intellij/diff/DiffColorSettingsTest.kt [new file with mode: 0644]
platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilAutoTest.kt
platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonUtilTest.kt
platform/dvcs-impl/src/com/intellij/dvcs/DvcsUtil.java
platform/icons/src/mac/appIconOk512.png [changed mode: 0644->0755]
platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java
platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java
platform/lang-impl/src/com/intellij/diagnostic/logging/LogFilesManager.java
platform/lang-impl/src/com/intellij/execution/lineMarker/ExecutorAction.java
platform/lang-impl/src/com/intellij/execution/lineMarker/RunLineMarkerContributor.java
platform/lang-impl/src/com/intellij/execution/lineMarker/RunLineMarkerProvider.java
platform/lang-impl/src/com/intellij/find/EditorSearchSession.java
platform/lang-impl/src/com/intellij/find/SearchReplaceComponent.java
platform/lang-impl/src/com/intellij/find/editorHeaderActions/NextOccurrenceAction.java
platform/lang-impl/src/com/intellij/find/editorHeaderActions/PrevNextOccurrenceAction.java
platform/lang-impl/src/com/intellij/find/editorHeaderActions/PrevOccurrenceAction.java
platform/lang-impl/src/com/intellij/find/impl/FindDialog.java
platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreviewController.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiTreeAnchorizer.java
platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
platform/lang-impl/src/com/intellij/util/indexing/MapReduceIndex.java
platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java
platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java
platform/platform-api/src/com/intellij/execution/process/CapturingProcessHandler.java
platform/platform-api/src/com/intellij/execution/process/OSProcessHandler.java
platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
platform/platform-api/src/com/intellij/openapi/ui/OnePixelDivider.java
platform/platform-api/src/com/intellij/openapi/wm/AppIconScheme.java
platform/platform-impl/src/com/intellij/codeInsight/hint/EditorFragmentComponent.java
platform/platform-impl/src/com/intellij/concurrency/ApplierCompleter.java
platform/platform-impl/src/com/intellij/errorreport/itn/ITNProxy.java
platform/platform-impl/src/com/intellij/execution/ExecutableValidator.java
platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java
platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java
platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptDialog.form [deleted file]
platform/platform-impl/src/com/intellij/ide/customize/CustomizeDesktopEntryStep.java
platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
platform/platform-impl/src/com/intellij/ide/customize/CustomizeIdeaWizardStepsProvider.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ide/customize/CustomizeKeyboardSchemeStepPanel.java [deleted file]
platform/platform-impl/src/com/intellij/ide/customize/CustomizeLauncherScriptStep.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ide/customize/CustomizeMacKeyboardLayoutStep.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ide/startupWizard/StartupWizard.java
platform/platform-impl/src/com/intellij/ide/startupWizard/StartupWizardAction.java
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
platform/platform-impl/src/com/intellij/idea/StartupUtil.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionMenu.java
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/IComponentStore.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/CutLineActionHandler.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/CutLineEndAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteToLineEndAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteToLineStartAction.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorComponentImpl.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/EditorSizeManager.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorView.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/TextLayoutCache.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/LargeFileEditorProvider.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/Group.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutPanel.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutConsumer.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ShortcutDialog.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ShortcutFilteringPanel.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ShortcutTextField.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt [new file with mode: 0644]
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/NativeFileWatcherImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeGlassPaneImpl.java
platform/platform-impl/src/com/intellij/remote/BaseRemoteProcessHandler.java
platform/platform-impl/src/com/intellij/ui/AppIcon.java
platform/platform-impl/src/com/intellij/ui/Splash.java
platform/platform-impl/src/org/jetbrains/concurrency/promise.kt
platform/platform-resources-en/src/messages/ApplicationBundle.properties
platform/platform-resources-en/src/messages/KeyMapBundle.properties
platform/platform-resources/src/META-INF/xdebugger.xml
platform/platform-resources/src/brokenPlugins.txt
platform/platform-resources/src/checkedPlugins.txt
platform/platform-resources/src/idea/PlatformApplicationInfo.xml
platform/platform-resources/src/idea/PlatformLangXmlApplicationInfo.xml
platform/platform-resources/src/idea/VcsActions.xml
platform/platform-tests/testData/editor/multiCaret/EditorCutLineEnd-after.txt [new file with mode: 0644]
platform/platform-tests/testData/editor/multiCaret/EditorCutLineEnd-before.txt [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorImplTest.java
platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManager.java
platform/script-debugger/backend/src/org/jetbrains/rpc/CommandProcessor.kt
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/connection/VmConnection.kt
platform/script-debugger/protocol/protocol-model-generator/src/BoxableType.kt
platform/script-debugger/protocol/protocol-model-generator/src/ClassNameScheme.kt
platform/script-debugger/protocol/protocol-model-generator/src/ClassScope.kt
platform/script-debugger/protocol/protocol-model-generator/src/CreateStandaloneTypeBindingVisitorBase.kt
platform/script-debugger/protocol/protocol-model-generator/src/DomainGenerator.kt
platform/script-debugger/protocol/protocol-model-generator/src/Enums.kt [new file with mode: 0644]
platform/script-debugger/protocol/protocol-model-generator/src/FileSet.kt
platform/script-debugger/protocol/protocol-model-generator/src/Generator.kt
platform/script-debugger/protocol/protocol-model-generator/src/InputClassScope.kt
platform/script-debugger/protocol/protocol-model-generator/src/ListType.kt
platform/script-debugger/protocol/protocol-model-generator/src/MemberScope.kt
platform/script-debugger/protocol/protocol-model-generator/src/MyCreateStandaloneTypeBindingVisitorBase.kt
platform/script-debugger/protocol/protocol-model-generator/src/OutputClassScope.kt
platform/script-debugger/protocol/protocol-model-generator/src/ParserRootInterfaceItem.kt
platform/script-debugger/protocol/protocol-model-generator/src/ResolveAndGenerateScope.kt
platform/script-debugger/protocol/protocol-model-generator/src/StandaloneType.kt
platform/script-debugger/protocol/protocol-model-generator/src/StandaloneTypeBinding.kt
platform/script-debugger/protocol/protocol-model-generator/src/TypeData.kt
platform/script-debugger/protocol/protocol-model-generator/src/TypeDescriptor.kt
platform/script-debugger/protocol/protocol-model-generator/src/TypeMap.kt
platform/script-debugger/protocol/protocol-model-generator/src/main.kt [deleted file]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/OutMessage.java [deleted file]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/OutMessage.kt [new file with mode: 0644]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/Request.java [deleted file]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/Request.kt [new file with mode: 0644]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/RequestImpl.java [deleted file]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/RequestImpl.kt [new file with mode: 0644]
platform/script-debugger/protocol/protocol-reader/src/Enums.kt [deleted file]
platform/script-debugger/protocol/protocol-reader/src/FieldProcessor.kt
platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt
platform/script-debugger/protocol/protocol-reader/src/TextOutput.kt
platform/script-debugger/protocol/protocol-reader/src/Util.kt
platform/script-debugger/protocol/schema-reader-generator/src/ItemDescriptor.kt [deleted file]
platform/script-debugger/protocol/schema-reader-generator/src/ProtocolMetaModel.kt
platform/script-debugger/protocol/schema-reader-generator/src/ProtocolSchemaReader.kt [deleted file]
platform/script-debugger/protocol/schema-reader-generator/src/SchemaReaderGenerator.kt
platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/MatcherImpl.java
platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptLog.java
platform/structure-view-api/src/com/intellij/ide/util/treeView/TreeAnchorizer.java
platform/testFramework/src/com/intellij/openapi/application/ex/PathManagerEx.java
platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
platform/util-rt/src/com/intellij/execution/rmi/ssl/SslSocketFactory.java
platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java
platform/util-rt/src/com/intellij/security/CompositeX509TrustManager.java [new file with mode: 0644]
platform/util-rt/src/com/intellij/util/Function.java
platform/util/resources/misc/registry.properties
platform/util/src/com/intellij/execution/TaskExecutor.java
platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java
platform/util/src/com/intellij/execution/process/ProcessWaitFor.java
platform/util/src/com/intellij/openapi/util/Version.java
platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java
platform/util/src/com/intellij/openapi/util/objectTree/ObjectTree.java
platform/util/src/com/intellij/openapi/util/objectTree/ThrowableInterner.java [new file with mode: 0644]
platform/util/src/com/intellij/util/ConcurrencyUtil.java
platform/util/src/com/intellij/util/EnvironmentUtil.java
platform/util/src/com/intellij/util/ExceptionUtil.java
platform/util/src/com/intellij/util/VersionUtil.java [new file with mode: 0644]
platform/util/src/com/intellij/util/containers/FilteredTraverserBase.java
platform/util/src/com/intellij/util/containers/RefHashMap.java
platform/util/src/com/intellij/util/io/BaseDataReader.java
platform/util/src/com/intellij/util/io/BinaryOutputReader.java
platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
platform/util/src/com/intellij/util/ui/UIUtil.java
platform/util/testSrc/com/intellij/openapi/util/objectTree/DisposerTest.java
platform/util/testSrc/com/intellij/util/VersionUtilTest.java [new file with mode: 0644]
platform/vcs-api/src/com/intellij/openapi/vcs/annotate/AnnotationGutterActionProvider.java
platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeDialogCustomizer.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/SelectGroupingAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
platform/vcs-impl/src/com/intellij/vcs/VcsShowLocalChangesAction.java [new file with mode: 0644]
platform/vcs-impl/src/com/intellij/vcs/VcsShowShelfAction.java [new file with mode: 0644]
platform/vcs-impl/src/com/intellij/vcs/VcsShowToolWindowTabAction.java [new file with mode: 0644]
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorImpl.java
platform/vcs-log/graph/test/com/intellij/vcs/log/graph/StrUtils.kt
platform/vcs-log/graph/test/com/intellij/vcs/log/graph/TestGraphBuilder.kt
platform/vcs-log/graph/test/com/intellij/vcs/log/graph/impl/EdgeStorageTest.kt
platform/vcs-log/graph/test/com/intellij/vcs/log/graph/impl/FragmentGeneratorTest.kt
platform/vcs-log/graph/test/com/intellij/vcs/log/graph/impl/print/PrintElementGeneratorTest.kt
platform/vcs-log/impl/src/META-INF/vcs-log.xml
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsShowLogAction.java [new file with mode: 0644]
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/CastToConcreteClassInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EmptyStatementBodyInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectToStringInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/EmptyClassInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneDeclaresCloneNotSupportedInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneInNonCloneableClassInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/UnnecessaryInitCauseInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/UnusedCatchParameterInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/PlaceholderCountMatchesArgumentCountInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ControlFlowUtils.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpressionUtils.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SwitchUtils.java
plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java
plugins/InspectionGadgets/src/inspectionDescriptions/CastToConcreteClass.html
plugins/InspectionGadgets/src/inspectionDescriptions/ObjectToString.html
plugins/InspectionGadgets/test/com/siyeh/igfixes/errorhandling/unnecessary_init_cause/Indirect.after.java
plugins/InspectionGadgets/test/com/siyeh/igfixes/errorhandling/unnecessary_init_cause/Indirect.java
plugins/InspectionGadgets/test/com/siyeh/igfixes/migration/while_can_be_foreach/UnboundWildcard.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/migration/while_can_be_foreach/UnboundWildcard.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/SlashSlashInLiteral.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/SlashSlashInLiteral.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/abstraction/cast_to_concrete_class/CastToConcreteClass.java
plugins/InspectionGadgets/test/com/siyeh/igtest/abstraction/cast_to_concrete_class/expected.xml [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/empty_statement_body/EmptyStatementBody.java
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/empty_statement_body/expected.xml [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/object_to_string/ObjectToString.java
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/object_to_string/expected.xml [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/classlayout/empty_class/ClassWithComments.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/performance/string_buffer_replaceable_by_string/expected.xml [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/style/string_buffer_replaceable_by_string/StringBufferReplaceableByString.java [moved from plugins/InspectionGadgets/test/com/siyeh/igtest/performance/string_buffer_replaceable_by_string/StringBufferReplaceableByString.java with 75% similarity]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/abstraction/CastToConcreteClassInspectionTest.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/EmptyStatementBodyInspectionTest.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/ObjectToStringInspectionTest.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/classlayout/EmptyClassInspectionTest.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/errorhandling/UnnecessaryInitCauseInspectionTest.java [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/errorhandling/UnusedCatchParameterInspectionTest.java [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/migration/WhileCanBeForeachFixTest.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/style/StringBufferReplaceableByStringFixTest.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/logging/PlaceholderCountMatchesArgumentCountInspectionTest.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/StringBufferReplaceableByStringInspectionTest.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/IfToSwitchPredicate.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceIfWithSwitchIntention.java
plugins/IntentionPowerPak/test/com/siyeh/ipp/switchtoif/replace_if_with_switch/ObjectsEquals.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/switchtoif/replace_if_with_switch/ObjectsEquals_after.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/switchtoif/replace_if_with_switch/StringEquality.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/switchtoif/replace_if_with_switch/StringEquality_after.java [new file with mode: 0644]
plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/switchtoif/ReplaceIfWithSwitchIntentionTest.java
plugins/devkit/resources/META-INF/plugin.xml
plugins/git4idea/src/META-INF/plugin.xml
plugins/git4idea/src/git4idea/GitUtil.java
plugins/git4idea/src/git4idea/actions/GitShowCommitInLogAnnotationGutterActionProvider.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java
plugins/git4idea/src/git4idea/history/GitHistoryProvider.java
plugins/git4idea/src/git4idea/log/GitShowCommitInLogAction.java [moved from plugins/git4idea/src/git4idea/history/wholeTree/SelectRevisionInGitLogAction.java with 83% similarity]
plugins/git4idea/src/git4idea/merge/GitConflictResolver.java
plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
plugins/git4idea/src/git4idea/util/GitPreservingProcess.java
plugins/github/src/org/jetbrains/plugins/github/GithubShowCommitInBrowserFromAnnotateAction.java
plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleClassFinder.java
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImpl.java
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyTraverser.java [new file with mode: 0644]
plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImplTest.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GrAnnotatorImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/type/GroovyStaticTypeCheckVisitor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/GroovyCoreEnvironment.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/types/TypeInferenceHelper.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/source/impl/GroovyTreeGenerator.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/impl/statements/expressions/GrReferenceExpressionImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrClosureDelegateTypeCalculator.java [new file with mode: 0644]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/GrExpressionTypeCalculator.java [new file with mode: 0644]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyPropertyUtils.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/DeclarationCacheKey.java
plugins/groovy/src/META-INF/plugin.xml
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveWithDelegatesToTest.groovy
plugins/hg4idea/src/org/zmlx/hg4idea/cherrypick/HgCherryPicker.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgMergeCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgUpdateCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandProcessHandler.java
plugins/hg4idea/src/org/zmlx/hg4idea/execution/ShellCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxDefaultPropertyElementDescriptor.java
plugins/javaFX/testData/highlighting/rootTagWithImport.fxml [new file with mode: 0644]
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryAttachHandler.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java
plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnProcessHandler.java
plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltConfigImpl.java
python/edu/resources/idea/PyCharmEduApplicationInfo.xml
python/helpers/py2only/docutils/__init__.py [moved from python/helpers/docutils/__init__.py with 100% similarity]
python/helpers/py2only/docutils/_compat.py [moved from python/helpers/docutils/_compat.py with 96% similarity]
python/helpers/py2only/docutils/_string_template_compat.py [moved from python/helpers/docutils/_string_template_compat.py with 100% similarity]
python/helpers/py2only/docutils/core.py [moved from python/helpers/docutils/core.py with 99% similarity]
python/helpers/py2only/docutils/docutils.conf [moved from python/helpers/docutils/docutils.conf with 100% similarity]
python/helpers/py2only/docutils/examples.py [moved from python/helpers/docutils/examples.py with 100% similarity]
python/helpers/py2only/docutils/frontend.py [moved from python/helpers/docutils/frontend.py with 99% similarity]
python/helpers/py2only/docutils/io.py [moved from python/helpers/docutils/io.py with 100% similarity]
python/helpers/py2only/docutils/languages/__init__.py [moved from python/helpers/docutils/languages/__init__.py with 100% similarity]
python/helpers/py2only/docutils/languages/en.py [moved from python/helpers/docutils/languages/en.py with 100% similarity]
python/helpers/py2only/docutils/nodes.py [moved from python/helpers/docutils/nodes.py with 99% similarity]
python/helpers/py2only/docutils/parsers/__init__.py [moved from python/helpers/docutils/parsers/__init__.py with 100% similarity]
python/helpers/py2only/docutils/parsers/null.py [moved from python/helpers/docutils/parsers/null.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/__init__.py [moved from python/helpers/docutils/parsers/rst/__init__.py with 99% similarity]
python/helpers/py2only/docutils/parsers/rst/directives/__init__.py [moved from python/helpers/docutils/parsers/rst/directives/__init__.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/directives/admonitions.py [moved from python/helpers/docutils/parsers/rst/directives/admonitions.py with 97% similarity]
python/helpers/py2only/docutils/parsers/rst/directives/body.py [moved from python/helpers/docutils/parsers/rst/directives/body.py with 99% similarity]
python/helpers/py2only/docutils/parsers/rst/directives/html.py [moved from python/helpers/docutils/parsers/rst/directives/html.py with 99% similarity]
python/helpers/py2only/docutils/parsers/rst/directives/images.py [moved from python/helpers/docutils/parsers/rst/directives/images.py with 99% similarity]
python/helpers/py2only/docutils/parsers/rst/directives/misc.py [moved from python/helpers/docutils/parsers/rst/directives/misc.py with 99% similarity]
python/helpers/py2only/docutils/parsers/rst/directives/parts.py [moved from python/helpers/docutils/parsers/rst/directives/parts.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/directives/references.py [moved from python/helpers/docutils/parsers/rst/directives/references.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/directives/tables.py [moved from python/helpers/docutils/parsers/rst/directives/tables.py with 99% similarity]
python/helpers/py2only/docutils/parsers/rst/include/README.txt [moved from python/helpers/docutils/parsers/rst/include/README.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isoamsa.txt [moved from python/helpers/docutils/parsers/rst/include/isoamsa.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isoamsb.txt [moved from python/helpers/docutils/parsers/rst/include/isoamsb.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isoamsc.txt [moved from python/helpers/docutils/parsers/rst/include/isoamsc.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isoamsn.txt [moved from python/helpers/docutils/parsers/rst/include/isoamsn.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isoamso.txt [moved from python/helpers/docutils/parsers/rst/include/isoamso.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isoamsr.txt [moved from python/helpers/docutils/parsers/rst/include/isoamsr.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isobox.txt [moved from python/helpers/docutils/parsers/rst/include/isobox.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isocyr1.txt [moved from python/helpers/docutils/parsers/rst/include/isocyr1.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isocyr2.txt [moved from python/helpers/docutils/parsers/rst/include/isocyr2.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isodia.txt [moved from python/helpers/docutils/parsers/rst/include/isodia.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isogrk1.txt [moved from python/helpers/docutils/parsers/rst/include/isogrk1.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isogrk2.txt [moved from python/helpers/docutils/parsers/rst/include/isogrk2.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isogrk3.txt [moved from python/helpers/docutils/parsers/rst/include/isogrk3.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isogrk4-wide.txt [moved from python/helpers/docutils/parsers/rst/include/isogrk4-wide.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isogrk4.txt [moved from python/helpers/docutils/parsers/rst/include/isogrk4.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isolat1.txt [moved from python/helpers/docutils/parsers/rst/include/isolat1.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isolat2.txt [moved from python/helpers/docutils/parsers/rst/include/isolat2.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isomfrk-wide.txt [moved from python/helpers/docutils/parsers/rst/include/isomfrk-wide.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isomfrk.txt [moved from python/helpers/docutils/parsers/rst/include/isomfrk.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isomopf-wide.txt [moved from python/helpers/docutils/parsers/rst/include/isomopf-wide.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isomopf.txt [moved from python/helpers/docutils/parsers/rst/include/isomopf.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isomscr-wide.txt [moved from python/helpers/docutils/parsers/rst/include/isomscr-wide.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isomscr.txt [moved from python/helpers/docutils/parsers/rst/include/isomscr.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isonum.txt [moved from python/helpers/docutils/parsers/rst/include/isonum.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isopub.txt [moved from python/helpers/docutils/parsers/rst/include/isopub.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/isotech.txt [moved from python/helpers/docutils/parsers/rst/include/isotech.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/mmlalias.txt [moved from python/helpers/docutils/parsers/rst/include/mmlalias.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/mmlextra-wide.txt [moved from python/helpers/docutils/parsers/rst/include/mmlextra-wide.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/mmlextra.txt [moved from python/helpers/docutils/parsers/rst/include/mmlextra.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/s5defs.txt [moved from python/helpers/docutils/parsers/rst/include/s5defs.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/xhtml1-lat1.txt [moved from python/helpers/docutils/parsers/rst/include/xhtml1-lat1.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/xhtml1-special.txt [moved from python/helpers/docutils/parsers/rst/include/xhtml1-special.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/include/xhtml1-symbol.txt [moved from python/helpers/docutils/parsers/rst/include/xhtml1-symbol.txt with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/__init__.py [moved from python/helpers/docutils/parsers/rst/languages/__init__.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/af.py [moved from python/helpers/docutils/parsers/rst/languages/af.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/ca.py [moved from python/helpers/docutils/parsers/rst/languages/ca.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/cs.py [moved from python/helpers/docutils/parsers/rst/languages/cs.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/de.py [moved from python/helpers/docutils/parsers/rst/languages/de.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/en.py [moved from python/helpers/docutils/parsers/rst/languages/en.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/eo.py [moved from python/helpers/docutils/parsers/rst/languages/eo.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/es.py [moved from python/helpers/docutils/parsers/rst/languages/es.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/fi.py [moved from python/helpers/docutils/parsers/rst/languages/fi.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/fr.py [moved from python/helpers/docutils/parsers/rst/languages/fr.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/gl.py [moved from python/helpers/docutils/parsers/rst/languages/gl.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/he.py [moved from python/helpers/docutils/parsers/rst/languages/he.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/it.py [moved from python/helpers/docutils/parsers/rst/languages/it.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/ja.py [moved from python/helpers/docutils/parsers/rst/languages/ja.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/nl.py [moved from python/helpers/docutils/parsers/rst/languages/nl.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/pl.py [moved from python/helpers/docutils/parsers/rst/languages/pl.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/pt_br.py [moved from python/helpers/docutils/parsers/rst/languages/pt_br.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/ru.py [moved from python/helpers/docutils/parsers/rst/languages/ru.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/sk.py [moved from python/helpers/docutils/parsers/rst/languages/sk.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/sv.py [moved from python/helpers/docutils/parsers/rst/languages/sv.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/zh_cn.py [moved from python/helpers/docutils/parsers/rst/languages/zh_cn.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/languages/zh_tw.py [moved from python/helpers/docutils/parsers/rst/languages/zh_tw.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/roles.py [moved from python/helpers/docutils/parsers/rst/roles.py with 100% similarity]
python/helpers/py2only/docutils/parsers/rst/states.py [moved from python/helpers/docutils/parsers/rst/states.py with 99% similarity]
python/helpers/py2only/docutils/parsers/rst/tableparser.py [moved from python/helpers/docutils/parsers/rst/tableparser.py with 100% similarity]
python/helpers/py2only/docutils/readers/__init__.py [moved from python/helpers/docutils/readers/__init__.py with 100% similarity]
python/helpers/py2only/docutils/readers/doctree.py [moved from python/helpers/docutils/readers/doctree.py with 100% similarity]
python/helpers/py2only/docutils/readers/pep.py [moved from python/helpers/docutils/readers/pep.py with 95% similarity]
python/helpers/py2only/docutils/readers/python/__init__.py [moved from python/helpers/docutils/readers/python/__init__.py with 99% similarity]
python/helpers/py2only/docutils/readers/python/moduleparser.py [moved from python/helpers/docutils/readers/python/moduleparser.py with 99% similarity]
python/helpers/py2only/docutils/readers/python/pynodes.py [moved from python/helpers/docutils/readers/python/pynodes.py with 97% similarity]
python/helpers/py2only/docutils/readers/standalone.py [moved from python/helpers/docutils/readers/standalone.py with 99% similarity]
python/helpers/py2only/docutils/statemachine.py [moved from python/helpers/docutils/statemachine.py with 100% similarity]
python/helpers/py2only/docutils/transforms/__init__.py [moved from python/helpers/docutils/transforms/__init__.py with 100% similarity]
python/helpers/py2only/docutils/transforms/components.py [moved from python/helpers/docutils/transforms/components.py with 90% similarity]
python/helpers/py2only/docutils/transforms/frontmatter.py [moved from python/helpers/docutils/transforms/frontmatter.py with 99% similarity]
python/helpers/py2only/docutils/transforms/misc.py [moved from python/helpers/docutils/transforms/misc.py with 98% similarity]
python/helpers/py2only/docutils/transforms/parts.py [moved from python/helpers/docutils/transforms/parts.py with 98% similarity]
python/helpers/py2only/docutils/transforms/peps.py [moved from python/helpers/docutils/transforms/peps.py with 98% similarity]
python/helpers/py2only/docutils/transforms/references.py [moved from python/helpers/docutils/transforms/references.py with 99% similarity]
python/helpers/py2only/docutils/transforms/universal.py [moved from python/helpers/docutils/transforms/universal.py with 98% similarity]
python/helpers/py2only/docutils/transforms/writer_aux.py [moved from python/helpers/docutils/transforms/writer_aux.py with 98% similarity]
python/helpers/py2only/docutils/urischemes.py [moved from python/helpers/docutils/urischemes.py with 100% similarity]
python/helpers/py2only/docutils/utils.py [moved from python/helpers/docutils/utils.py with 99% similarity]
python/helpers/py2only/docutils/writers/__init__.py [moved from python/helpers/docutils/writers/__init__.py with 99% similarity]
python/helpers/py2only/docutils/writers/docutils_xml.py [moved from python/helpers/docutils/writers/docutils_xml.py with 100% similarity]
python/helpers/py2only/docutils/writers/html4css1/__init__.py [moved from python/helpers/docutils/writers/html4css1/__init__.py with 99% similarity]
python/helpers/py2only/docutils/writers/html4css1/html4css1.css [moved from python/helpers/docutils/writers/html4css1/html4css1.css with 100% similarity]
python/helpers/py2only/docutils/writers/html4css1/template.txt [moved from python/helpers/docutils/writers/html4css1/template.txt with 100% similarity]
python/helpers/py2only/docutils/writers/latex2e/__init__.py [moved from python/helpers/docutils/writers/latex2e/__init__.py with 99% similarity]
python/helpers/py2only/docutils/writers/latex2e/default.tex [moved from python/helpers/docutils/writers/latex2e/default.tex with 100% similarity]
python/helpers/py2only/docutils/writers/latex2e/docutils-05-compat.sty [moved from python/helpers/docutils/writers/latex2e/docutils-05-compat.sty with 100% similarity]
python/helpers/py2only/docutils/writers/latex2e/titlepage.tex [moved from python/helpers/docutils/writers/latex2e/titlepage.tex with 100% similarity]
python/helpers/py2only/docutils/writers/manpage.py [moved from python/helpers/docutils/writers/manpage.py with 99% similarity]
python/helpers/py2only/docutils/writers/newlatex2e/__init__.py [moved from python/helpers/docutils/writers/newlatex2e/__init__.py with 99% similarity]
python/helpers/py2only/docutils/writers/newlatex2e/base.tex [moved from python/helpers/docutils/writers/newlatex2e/base.tex with 100% similarity]
python/helpers/py2only/docutils/writers/newlatex2e/notes.txt [moved from python/helpers/docutils/writers/newlatex2e/notes.txt with 100% similarity]
python/helpers/py2only/docutils/writers/newlatex2e/tests.txt [moved from python/helpers/docutils/writers/newlatex2e/tests.txt with 100% similarity]
python/helpers/py2only/docutils/writers/newlatex2e/unicode_map.py [moved from python/helpers/docutils/writers/newlatex2e/unicode_map.py with 100% similarity]
python/helpers/py2only/docutils/writers/null.py [moved from python/helpers/docutils/writers/null.py with 100% similarity]
python/helpers/py2only/docutils/writers/odf_odt/__init__.py [moved from python/helpers/docutils/writers/odf_odt/__init__.py with 99% similarity]
python/helpers/py2only/docutils/writers/odf_odt/pygmentsformatter.py [moved from python/helpers/docutils/writers/odf_odt/pygmentsformatter.py with 100% similarity]
python/helpers/py2only/docutils/writers/odf_odt/styles.odt [moved from python/helpers/docutils/writers/odf_odt/styles.odt with 100% similarity]
python/helpers/py2only/docutils/writers/pep_html/__init__.py [moved from python/helpers/docutils/writers/pep_html/__init__.py with 97% similarity]
python/helpers/py2only/docutils/writers/pep_html/pep.css [moved from python/helpers/docutils/writers/pep_html/pep.css with 100% similarity]
python/helpers/py2only/docutils/writers/pep_html/template.txt [moved from python/helpers/docutils/writers/pep_html/template.txt with 100% similarity]
python/helpers/py2only/docutils/writers/pseudoxml.py [moved from python/helpers/docutils/writers/pseudoxml.py with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/__init__.py [moved from python/helpers/docutils/writers/s5_html/__init__.py with 99% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/README.txt [moved from python/helpers/docutils/writers/s5_html/themes/README.txt with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/big-black/__base__ [moved from python/helpers/docutils/writers/s5_html/themes/big-black/__base__ with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/big-black/framing.css [moved from python/helpers/docutils/writers/s5_html/themes/big-black/framing.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/big-black/pretty.css [moved from python/helpers/docutils/writers/s5_html/themes/big-black/pretty.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/big-white/framing.css [moved from python/helpers/docutils/writers/s5_html/themes/big-white/framing.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/big-white/pretty.css [moved from python/helpers/docutils/writers/s5_html/themes/big-white/pretty.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/default/blank.gif [moved from python/helpers/docutils/writers/s5_html/themes/default/blank.gif with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/default/framing.css [moved from python/helpers/docutils/writers/s5_html/themes/default/framing.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/default/iepngfix.htc [moved from python/helpers/docutils/writers/s5_html/themes/default/iepngfix.htc with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/default/opera.css [moved from python/helpers/docutils/writers/s5_html/themes/default/opera.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/default/outline.css [moved from python/helpers/docutils/writers/s5_html/themes/default/outline.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/default/pretty.css [moved from python/helpers/docutils/writers/s5_html/themes/default/pretty.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/default/print.css [moved from python/helpers/docutils/writers/s5_html/themes/default/print.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/default/s5-core.css [moved from python/helpers/docutils/writers/s5_html/themes/default/s5-core.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/default/slides.css [moved from python/helpers/docutils/writers/s5_html/themes/default/slides.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/default/slides.js [moved from python/helpers/docutils/writers/s5_html/themes/default/slides.js with 99% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/medium-black/__base__ [moved from python/helpers/docutils/writers/s5_html/themes/medium-black/__base__ with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/medium-black/pretty.css [moved from python/helpers/docutils/writers/s5_html/themes/medium-black/pretty.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/medium-white/framing.css [moved from python/helpers/docutils/writers/s5_html/themes/medium-white/framing.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/medium-white/pretty.css [moved from python/helpers/docutils/writers/s5_html/themes/medium-white/pretty.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/small-black/__base__ [moved from python/helpers/docutils/writers/s5_html/themes/small-black/__base__ with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/small-black/pretty.css [moved from python/helpers/docutils/writers/s5_html/themes/small-black/pretty.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/small-white/framing.css [moved from python/helpers/docutils/writers/s5_html/themes/small-white/framing.css with 100% similarity]
python/helpers/py2only/docutils/writers/s5_html/themes/small-white/pretty.css [moved from python/helpers/docutils/writers/s5_html/themes/small-white/pretty.css with 100% similarity]
python/helpers/py3only/docutils/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/_compat.py [new file with mode: 0644]
python/helpers/py3only/docutils/core.py [new file with mode: 0644]
python/helpers/py3only/docutils/examples.py [new file with mode: 0644]
python/helpers/py3only/docutils/frontend.py [new file with mode: 0644]
python/helpers/py3only/docutils/io.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/af.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/ca.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/cs.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/da.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/de.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/en.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/eo.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/es.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/fi.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/fr.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/gl.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/he.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/it.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/ja.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/lt.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/nl.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/pl.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/pt_br.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/ru.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/sk.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/sv.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/zh_cn.py [new file with mode: 0644]
python/helpers/py3only/docutils/languages/zh_tw.py [new file with mode: 0644]
python/helpers/py3only/docutils/nodes.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/null.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/directives/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/directives/admonitions.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/directives/body.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/directives/html.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/directives/images.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/directives/misc.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/directives/parts.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/directives/references.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/directives/tables.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/README.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isoamsa.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isoamsb.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isoamsc.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isoamsn.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isoamso.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isoamsr.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isobox.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isocyr1.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isocyr2.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isodia.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isogrk1.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isogrk2.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isogrk3.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isogrk4-wide.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isogrk4.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isolat1.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isolat2.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isomfrk-wide.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isomfrk.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isomopf-wide.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isomopf.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isomscr-wide.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isomscr.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isonum.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isopub.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/isotech.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/mmlalias.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/mmlextra-wide.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/mmlextra.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/s5defs.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/xhtml1-lat1.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/xhtml1-special.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/include/xhtml1-symbol.txt [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/af.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/ca.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/cs.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/da.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/de.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/en.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/eo.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/es.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/fi.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/fr.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/gl.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/he.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/it.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/ja.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/lt.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/nl.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/pl.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/pt_br.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/ru.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/sk.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/sv.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/zh_cn.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/languages/zh_tw.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/roles.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/states.py [new file with mode: 0644]
python/helpers/py3only/docutils/parsers/rst/tableparser.py [new file with mode: 0644]
python/helpers/py3only/docutils/readers/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/readers/doctree.py [new file with mode: 0644]
python/helpers/py3only/docutils/readers/pep.py [new file with mode: 0644]
python/helpers/py3only/docutils/readers/standalone.py [new file with mode: 0644]
python/helpers/py3only/docutils/statemachine.py [new file with mode: 0644]
python/helpers/py3only/docutils/transforms/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/transforms/components.py [new file with mode: 0644]
python/helpers/py3only/docutils/transforms/frontmatter.py [new file with mode: 0644]
python/helpers/py3only/docutils/transforms/misc.py [new file with mode: 0644]
python/helpers/py3only/docutils/transforms/parts.py [new file with mode: 0644]
python/helpers/py3only/docutils/transforms/peps.py [new file with mode: 0644]
python/helpers/py3only/docutils/transforms/references.py [new file with mode: 0644]
python/helpers/py3only/docutils/transforms/universal.py [new file with mode: 0644]
python/helpers/py3only/docutils/transforms/writer_aux.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/code_analyzer.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/error_reporting.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/math/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/math/latex2mathml.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/math/math2html.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/math/tex2unichar.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/math/unichar2tex.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/punctuation_chars.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/roman.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/smartquotes.py [new file with mode: 0644]
python/helpers/py3only/docutils/utils/urischemes.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/docutils_xml.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/html4css1/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/html4css1/html4css1.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/html4css1/math.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/html4css1/template.txt [new file with mode: 0644]
python/helpers/py3only/docutils/writers/latex2e/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/latex2e/default.tex [new file with mode: 0644]
python/helpers/py3only/docutils/writers/latex2e/titlepage.tex [new file with mode: 0644]
python/helpers/py3only/docutils/writers/latex2e/xelatex.tex [new file with mode: 0644]
python/helpers/py3only/docutils/writers/manpage.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/null.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/odf_odt/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/odf_odt/pygmentsformatter.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/odf_odt/styles.odt [new file with mode: 0644]
python/helpers/py3only/docutils/writers/pep_html/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/pep_html/pep.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/pep_html/template.txt [new file with mode: 0644]
python/helpers/py3only/docutils/writers/pseudoxml.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/__init__.py [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/README.txt [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/big-black/__base__ [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/big-black/framing.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/big-black/pretty.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/big-white/framing.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/big-white/pretty.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/default/blank.gif [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/default/framing.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/default/iepngfix.htc [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/default/opera.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/default/outline.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/default/pretty.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/default/print.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/default/s5-core.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/default/slides.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/default/slides.js [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/medium-black/__base__ [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/medium-black/pretty.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/medium-white/framing.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/medium-white/pretty.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/small-black/__base__ [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/small-black/pretty.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/small-white/framing.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/s5_html/themes/small-white/pretty.css [new file with mode: 0644]
python/helpers/py3only/docutils/writers/xetex/__init__.py [new file with mode: 0644]
python/helpers/pydev/pydevd_breakpoints.py
python/helpers/pydev/pydevd_frame.py
python/helpers/rest_formatter.py
python/ide/src/com/jetbrains/python/configuration/PyDiffPreviewProvider.java
python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyParsingContext.java
python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTargetExpression.java
python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTargetExpressionElementType.java [new file with mode: 0644]
python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTokenTypes.java
python/psi-api/src/com/jetbrains/python/psi/PyTargetExpression.java
python/resources/idea/PyCharmCoreApplicationInfo.xml
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/HelperPackage.java
python/src/com/jetbrains/python/PyBundle.properties
python/src/com/jetbrains/python/PythonHelper.java
python/src/com/jetbrains/python/codeInsight/completion/PyDocstringCompletionContributor.java
python/src/com/jetbrains/python/codeInsight/dataflow/scope/ScopeUtil.java
python/src/com/jetbrains/python/documentation/docstrings/DocStringUtil.java
python/src/com/jetbrains/python/documentation/docstrings/PyStructuredDocstringFormatter.java
python/src/com/jetbrains/python/formatter/PyBlock.java
python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java
python/src/com/jetbrains/python/inspections/quickfix/PyReplaceTupleWithListQuickFix.java
python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java
python/src/com/jetbrains/python/packaging/PyCondaPackageService.java
python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
python/src/com/jetbrains/python/packaging/PyPackageManagersImpl.java
python/src/com/jetbrains/python/packaging/PyRemotePackageManagerImpl.java
python/src/com/jetbrains/python/packaging/ui/PyCondaManagementService.java
python/src/com/jetbrains/python/packaging/ui/PyPackageManagementService.java
python/src/com/jetbrains/python/projectView/PyRemoteLibrariesNode.java
python/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java
python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
python/src/com/jetbrains/python/psi/impl/stubs/PyTargetExpressionElementType.java
python/src/com/jetbrains/python/run/PythonCommandLineState.java
python/src/com/jetbrains/python/run/PythonProcessHandler.java
python/src/com/jetbrains/python/sdk/CreateCondaEnvDialog.java
python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java
python/src/com/jetbrains/python/sdk/PythonSdkType.java
python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java
python/testData/completion/paramNameInTypeDeclarationInRestDocstring.py [new file with mode: 0644]
python/testData/formatter/forceNewLineBeforeRightBraceInDictAfterColon.py [new file with mode: 0644]
python/testData/formatter/forceNewLineBeforeRightBraceInDictAfterColon_after.py [new file with mode: 0644]
python/testSrc/com/jetbrains/python/Py3TypeTest.java
python/testSrc/com/jetbrains/python/PyFormatterTest.java
python/testSrc/com/jetbrains/python/PyResolveCalleeTest.java
python/testSrc/com/jetbrains/python/PySectionBasedDocStringTest.java
python/testSrc/com/jetbrains/python/PyTypeTest.java
python/testSrc/com/jetbrains/python/PythonCompletionTest.java
resources/src/META-INF/IdeaPlugin.xml
spellchecker/src/com/intellij/spellchecker/english.dic
spellchecker/src/com/intellij/spellchecker/jetbrains.dic
xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java
xml/dom-impl/src/com/intellij/util/xml/impl/AttributeChildDescriptionImpl.java
xml/dom-impl/src/com/intellij/util/xml/stubs/FileStubSerializer.java
xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java
xml/dom-openapi/src/com/intellij/patterns/DomPatterns.java
xml/dom-openapi/src/com/intellij/util/xml/reflect/DomCollectionChildDescription.java
xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java

index 7d0b1870114c4dd52c88ed54cc5c2978ae3cbf63..68486c6350e6820418a04b6b2f0d4c6efb3dbefa 100644 (file)
@@ -9,6 +9,6 @@
     <plugin id="com.intellij.properties" />
     <plugin id="com.intellij.uiDesigner" />
     <plugin id="org.intellij.groovy" />
-    <plugin id="org.jetbrains.kotlin" min-version="1.0.0-beta" max-version="1.1" />
+    <plugin id="org.jetbrains.kotlin" min-version="1.0.0-beta-2423" max-version="1.1" />
   </component>
 </project>
\ No newline at end of file
index 73c5c50deb06174e38d5ad6cb6aea169444a311a..f6ca71196528ac7805e345acffb0edf673789168 100644 (file)
@@ -909,11 +909,32 @@ FunctionEnd
 ; custom uninstall functions
 ;------------------------------------------------------------------------------
 
-Function un.onInit
+Function un.getRegKey
+  ReadRegStr $R2 HKCU "Software\${MANUFACTURER}\${PRODUCT_REG_VER}" ""
+  StrCpy $R2 "$R2\bin"
+user:
+  StrCmp $R2 $INSTDIR HKCU admin
+HKCU:
   StrCpy $baseRegKey "HKCU"
+  goto Done
+admin:
+  ReadRegStr $R2 HKLM "Software\${MANUFACTURER}\${PRODUCT_REG_VER}" ""
+  StrCpy $R2 "$R2\bin"
+  StrCmp $R2 $INSTDIR HKLM cant_find_installation
+HKLM:
+  StrCpy $baseRegKey "HKLM"
+  goto Done
+cant_find_installation:
   ;admin perm. is required to uninstall?
   ${UnStrStr} $R0 $INSTDIR $PROGRAMFILES
-  StrCmp $R0 $INSTDIR requred_admin_perm UAC_Done
+  StrCmp $R0 $INSTDIR HKLM HKCU
+Done:
+FunctionEnd
+
+
+Function un.onInit
+  Call un.getRegKey
+  StrCmp $baseRegKey "HKLM" requred_admin_perm UAC_Done
 
 requred_admin_perm:
   ;the user has admin rights?
@@ -1116,18 +1137,12 @@ skip_delete_settings:
   ${EndIf}
 
   ReadRegStr $R9 HKCU "Software\${MANUFACTURER}\${PRODUCT_REG_VER}" "MenuFolder"
-  StrCmp $R9 "" "" clear_shortcuts
+  StrCmp $R9 "" "" shortcuts
   ReadRegStr $R9 HKLM "Software\${MANUFACTURER}\${PRODUCT_REG_VER}" "MenuFolder"
-  StrCmp $R9 "" clear_registry
+  StrCmp $R9 "" registry
   StrCpy $5 "Software\${MANUFACTURER}"
-;  call un.winVersion
-; ${If} $0 == "1"
-;    StrCpy $5 "Software\Wow6432Node\${MANUFACTURER}"
-; ${EndIf}
-clear_shortcuts:
+shortcuts:
   ;the user has the admin rights
-;  UserInfo::GetAccountType
-;  Pop $R2
   IfFileExists "$DESKTOP\${PRODUCT_FULL_NAME_WITH_VER}.lnk" keep_current_user
   SetShellVarContext all
 keep_current_user:
@@ -1141,18 +1156,8 @@ keep_current_user:
   Delete "$DESKTOP\${PRODUCT_FULL_NAME_WITH_VER}.lnk"
   Delete "$QUICKLAUNCH\${PRODUCT_FULL_NAME_WITH_VER}.lnk"
 
-clear_registry:
+registry:
   StrCpy $5 "Software\${MANUFACTURER}"
-  call un.winVersion
-  ${If} $0 == "1"
-    StrCpy $5 "Software\Wow6432Node\${MANUFACTURER}"
-  ${EndIf}
-
-  StrCpy $0 $baseRegKey
-  StrCpy $1 "$5\${PRODUCT_REG_VER}"
-  StrCpy $2 "MenuFolder"
-  Call un.OMDeleteRegValue
-
   StrCmp "${ASSOCIATION}" "NoAssociation" finish_uninstall
   push "${ASSOCIATION}"
 loop:
@@ -1166,25 +1171,29 @@ loop:
 finish_uninstall:
   StrCpy $0 $baseRegKey
   StrCpy $1 "$5\${PRODUCT_REG_VER}"
-  StrCpy $2 "Build"
-  Call un.OMReadRegStr
+  StrCpy $4 0
 
-  StrCpy $1 "$5\${PRODUCT_REG_VER}"
-  Call un.OMDeleteRegKey
+getValue:
+  Call un.OMEnumRegValue
+  IfErrors finish delValue
+delValue:
+  StrCpy $2 $3
+  Call un.OMDeleteRegValue
+  IfErrors 0 +2
+  IntOp $4 $4 + 1
+  goto getValue
+finish:
 
-  StrCpy $1 "$5\${MUI_PRODUCT}"
+  StrCpy $1 "$5\${PRODUCT_REG_VER}"
   Call un.OMDeleteRegKeyIfEmpty
-
   StrCpy $1 "$5"
   Call un.OMDeleteRegKeyIfEmpty
 
   StrCpy $0 "HKCR"
   StrCpy $1 "Applications\${PRODUCT_EXE_FILE}"
-  StrCpy $2 ""
   Call un.OMDeleteRegKey
   StrCpy $0 "HKCR"
   StrCpy $1 "${PRODUCT_PATHS_SELECTOR}"
-  StrCpy $2 ""
   Call un.OMDeleteRegKey
 
   StrCpy $0 "HKCR"
@@ -1196,7 +1205,9 @@ remove_IntelliJIdeaProjectFile:
   StrCpy $1 "IntelliJIdeaProjectFile"
   Call un.OMDeleteRegKey
 done:
-  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_WITH_VER}"
+  StrCpy $0 $baseRegKey
+  StrCpy $1 "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_WITH_VER}"
+  Call un.OMDeleteRegKey
   ;do not show feedback web page checkbox for EAP builds.
   StrCmp "${PRODUCT_WITH_VER}" "${MUI_PRODUCT} ${VER_BUILD}" end_of_uninstall feedback_web_page
 feedback_web_page:
index 79bf61f8e307973e602ec33246c1b0d7128ea332..baff6702852a5bdfc870efdcbf49588137d52dc7 100644 (file)
@@ -10,11 +10,11 @@ Function ${un}OMDeleteRegKey
   StrCmp $0 "HKLM" hklm
   StrCmp $0 "HKCR" hkcr
   hkcu:
-       DeleteRegKey HKCU $1            
-       goto done
+    DeleteRegKey HKCU $1
+    goto done
   hklm:  
     DeleteRegKey HKLM $1
-       goto done
+    goto done
   hkcr:        
     DeleteRegKey HKCR $1
 done:
@@ -87,7 +87,7 @@ FunctionEnd
 ; OMEnumRegKey
 ; $0 - root_key ("HKCU" | "HKLM" | "HKCR")
 ; $1 - subkey
-; $4 - value name
+; $4 - index
 ; $3 - result
 Function ${un}OMEnumRegKey
   ClearErrors
@@ -95,16 +95,38 @@ Function ${un}OMEnumRegKey
   StrCmp $0 "HKLM" hklm
   StrCmp $0 "HKCR" hkcr
   hkcu:
-       EnumRegKey $3 HKCU $1 $4
-       goto done
+    EnumRegKey $3 HKCU $1 $4
+    goto done
   hklm:  
-       EnumRegKey $3 HKLM $1 $4
+    EnumRegKey $3 HKLM $1 $4
     goto done
   hkcr:  
     EnumRegKey $3 HKCR $1 $4
 done:
 FunctionEnd
 
+; -----------------------------------------------------------------------------
+; OMEnumRegValue
+; $0 - root_key ("HKCU" | "HKLM" | "HKCR")
+; $1 - subkey
+; $4 - index
+; $3 - result
+Function ${un}OMEnumRegValue
+  ClearErrors
+  StrCmp $0 "HKCU" hkcu
+  StrCmp $0 "HKLM" hklm
+  StrCmp $0 "HKCR" hkcr
+  hkcu:
+    EnumRegValue $3 HKCU $1 $4
+    goto done
+  hklm:
+    EnumRegValue $3 HKLM $1 $4
+    goto done
+  hkcr:
+    EnumRegValue $3 HKCR $1 $4
+done:
+FunctionEnd
+
 ; -----------------------------------------------------------------------------
 ; OMWriteRegStr
 ; $0 - root_key ("HKCU" | "HKLM" | "HKCR")
@@ -117,13 +139,13 @@ Function ${un}OMWriteRegStr
   StrCmp $0 "HKLM" hklm
   StrCmp $0 "HKCR" hkcr
   hkcu:
-       WriteRegStr HKCU $1 $2 $3
-       goto done
+    WriteRegStr HKCU $1 $2 $3
+    goto done
   hklm:  
-       WriteRegStr HKLM $1 $2 $3
-       goto done
+    WriteRegStr HKLM $1 $2 $3
+    goto done
   hkcr:        
-       WriteRegStr HKCR $1 $2 $3
+    WriteRegStr HKCR $1 $2 $3
 done:
 FunctionEnd
 
index db611c2c56b1b109d07d576a6d4a5702abc869b5..fe8e3bbf0f74243ad44b6982c25a0c60c3b8d37d 100644 (file)
@@ -1,5 +1,6 @@
-<project name="Test gant invocation from Ant script" default="doGant">
+<project name="Test gant invocation from Ant script" default="doGant" xmlns:if="ant:if">
   <dirname property="build.dir" file="${ant.file}"/>
+  <property name="include.kotlin.jars.to.classpath" value="true"/>
   <property name="project.home" value="${build.dir}/.."/>
   <property name="gant.home" value="${project.home}/build/lib/gant"/>
   <property name="idea.lib" value="${project.home}/lib"/>
     </fileset>
     <pathelement path="${project.home}/build/groovy"/>
     <fileset file="${project.home}/jps/lib/optimizedFileManager.jar"/>
-    <fileset dir="${project.home}/build/kotlinc/jps" erroronmissingdir="false">
+    <fileset dir="${project.home}/build/kotlinc/jps" erroronmissingdir="false" if:true="${include.kotlin.jars.to.classpath}">
       <include name="*.jar"/>
     </fileset>
-    <fileset dir="${project.home}/build/kotlinc/lib" erroronmissingdir="false">
+    <fileset dir="${project.home}/build/kotlinc/lib" erroronmissingdir="false" if:true="${include.kotlin.jars.to.classpath}">
       <include name="kotlin-runtime.jar"/>
     </fileset>
-    <fileset dir="${project.home}/build/kotlinc/plugin/Kotlin/lib" erroronmissingdir="false">
+    <fileset dir="${project.home}/build/kotlinc/plugin/Kotlin/lib" erroronmissingdir="false" if:true="${include.kotlin.jars.to.classpath}">
       <include name="kotlin-plugin.jar"/>
     </fileset>
     <fileset dir="${idea.lib}">
index f8b7184fbbff9aa01327f7bd4034f3b6e52e1c3c..14e52d73646abc0e1575ed958e179e2393d8a670 100644 (file)
@@ -1,6 +1,3 @@
-import com.intellij.util.text.VersionComparatorUtil
-
-import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome
 /*
  * Copyright 2000-2015 JetBrains s.r.o.
  *
@@ -16,9 +13,12 @@ import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import com.intellij.util.text.VersionComparatorUtil
+
+import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome
 includeTargets << new File("${guessHome(this)}/build/scripts/utils.gant")
 
-String kotlinBuildConfigurationOnPublicTeamCity = "Kotlin_M15_2_Idea142branch150versionNoTests"
+String kotlinBuildConfigurationOnPublicTeamCity = "Kotlin_Beta2_Idea142branch150versionNoTests"
 
 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 f9d858dc3c874b11e0a3604faf698ef54f77bc36..3eba0f04df057b37335213de706907e56f76078a 100644 (file)
@@ -71,6 +71,7 @@ binding.setVariable("mem32", "-server -Xms128m -Xmx512m -XX:MaxPermSize=250m -XX
 binding.setVariable("mem64", "-Xms128m -Xmx750m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=240m")
 binding.setVariable("common_vmoptions", "-XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50 -ea " +
                                         "-Dsun.io.useCanonCaches=false -Djava.net.preferIPv4Stack=true " +
+                                        "-Djava.ext.dirs=\"\" " +
                                         "-XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow")
 
 binding.setVariable("vmOptions", { "$common_vmoptions".trim() })
index 84f918f3fa0a4b66e553d4f09cd3c7d2d3ff153f..9de0dff64d9fcc0ded164ed7ca138568ef698332 100644 (file)
@@ -28,6 +28,7 @@
       <java classname="org.apache.tools.ant.Main" fork="true" failonerror="true" dir="${project.home}">
         <sysproperty key="workIdeaHome" value="${work.idea.home}"/>
         <sysproperty key="gant.script" value="${project.home}/build/scripts/download_kotlin.gant"/>
+        <sysproperty key="include.kotlin.jars.to.classpath" value="false"/>
         <classpath>
           <fileset dir="${project.home}/lib/ant/lib">
             <include name="*.jar"/>
index 86c48623305e3ec27528caa2ea3e8a68ce94d886..7c0f69b3f5eb52573bad1e853a80255f2656e34d 100644 (file)
@@ -4,9 +4,8 @@
   <build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
   <install-over minbuild="129.1" maxbuild="139.9999" version="14"/>
   <logo url="/idea_community_logo.png" textcolor="aaaaaa" progressColor="FDA916" progressY="230" progressTailIcon="/community_progress_tail.png"/>
-  <about url="/idea_community_about.png" foreground="7A858F" copyrightForeground="7A858F" linkColor="9b5121" logoX="300" logoY="265" logoW="75" logoH="30"/>
+  <about url="/idea_community_about.png" foreground="333333" copyrightForeground="7A858F" linkColor="9b5121" logoX="300" logoY="265" logoW="75" logoH="30"/>
   <icon size32="/icon_CE.png" size16="/icon_CEsmall.png" size12="/toolwindows/toolWindowProject.png" size128="/icon_CE_128.png" ico="idea_CE.ico"/>
-  <package code="__PACKAGE_CODE__"/>
   <names product="IDEA" fullname="IntelliJ IDEA" script="idea"/>
 
   <welcome-screen logo-url="/Logo_welcomeScreen.png"/>
@@ -27,8 +26,7 @@
   <third-party url="http://www.jetbrains.org/"/>
   <jetbrains-tv url="https://www.youtube.com/user/intellijideavideo"/>
 
-  <plugins-page category="VCS Integration" title="Select VCS Integration Plugins"/>
-  <plugins-page title="Select Other Plugins"/>
+  <customize-ide-wizard provider="com.intellij.ide.customize.CustomizeIdeaWizardStepsProvider"/>
 
   <statistics settings="https://www.jetbrains.com/idea/statistics/stat-assistant.xml" service="https://www.jetbrains.com/idea/statistics/index.jsp"/>
 </component>
index 7e9e496d6d212786a0bfe410d8513d4e241f3dea..a474783912da59f6d1c93de057926ab1d2970f5b 100644 (file)
Binary files a/community-resources/src/idea_community_about.png and b/community-resources/src/idea_community_about.png differ
index b5553ec2a21e560a49b22c0f3f0ba6e1dd5e5a7a..c8e0fadae88d065989e2c6a1886a09049daec980 100644 (file)
Binary files a/community-resources/src/idea_community_about@2x.png and b/community-resources/src/idea_community_about@2x.png differ
index 8a5a6785e5346c71bd7351ff1f9924c0c9c521e2..ff26535f7394d4e7784c0ba8708c823c5c80e918 100644 (file)
Binary files a/community-resources/src/idea_community_logo.png and b/community-resources/src/idea_community_logo.png differ
index c206269413781135ef0f51ecaf2da5f637f42e11..74457686ab1d7700a02dbf8baf518c61c2ae57de 100644 (file)
Binary files a/community-resources/src/idea_community_logo@2x.png and b/community-resources/src/idea_community_logo@2x.png differ
index b3d9d549c7a365cee773fc771c9b656ba2a78b2a..df314b3e8c43a3459d16f81650c16d37c7f9eba4 100644 (file)
@@ -143,6 +143,11 @@ final class ImageEditorUI extends JPanel implements DataProvider, CopyProvider,
     ActionToolbar actionToolbar = actionManager.createActionToolbar(
       ImageEditorActions.ACTION_PLACE, actionGroup, true
     );
+    
+    // Make sure toolbar is 'ready' before it's added to component hierarchy 
+    // to prevent ActionToolbarImpl.updateActionsImpl(boolean, boolean) from increasing popup size unnecessarily
+    actionToolbar.updateActionsImmediately();
+    
     actionToolbar.setTargetComponent(this);
 
     JComponent toolbarPanel = actionToolbar.getComponent();
index 187e48cebf3cfac0ea869bd10c63988c71c2526d..79334b7af0a5168fa561711323f8ddedc3be0121 100644 (file)
@@ -135,6 +135,7 @@ public class BuildManager implements Disposable {
   private static final String COMPILER_PROCESS_JDK_PROPERTY = "compiler.process.jdk";
   public static final String SYSTEM_ROOT = "compile-server";
   public static final String TEMP_DIR_NAME = "_temp_";
+  private static final String JAVA_EXT_DIRS_PROPERTY = "java.ext.dirs";
   // do not make static in order not to access application on class load
   private final boolean IS_UNIT_TEST_MODE;
   private static final String IWS_EXTENSION = ".iws";
@@ -1163,6 +1164,10 @@ public class BuildManager implements Disposable {
       cmdLine.addParameters(args);
     }
 
+    if (!cmdLine.getParametersList().hasProperty(JAVA_EXT_DIRS_PROPERTY)) {
+      cmdLine.getParametersList().addProperty(JAVA_EXT_DIRS_PROPERTY, "\"\"");
+    }
+
     @SuppressWarnings("UnnecessaryFullyQualifiedName")
     final Class<?> launcherClass = org.jetbrains.jps.cmdline.Launcher.class;
 
@@ -1201,7 +1206,7 @@ public class BuildManager implements Disposable {
     
     final Process process = cmdLine.createProcess();
 
-    final OSProcessHandler processHandler = new OSProcessHandler(process, null, mySystemCharset) {
+    final OSProcessHandler processHandler = new OSProcessHandler(process, null, mySystemCharset, BuildMain.class.getName()+" external process") {
       @Override
       protected boolean shouldDestroyProcessRecursively() {
         return true;
@@ -1313,6 +1318,7 @@ public class BuildManager implements Disposable {
 
   public void stopListening() {
     myChannelRegistrar.close();
+    myListenPort = -1;
   }
 
   private int startListening() throws Exception {
@@ -1766,7 +1772,7 @@ public class BuildManager implements Disposable {
       return delegate;
     }
 
-    public synchronized boolean setDelegate(@NotNull TaskFuture<? extends T> delegate) {
+    private synchronized boolean setDelegate(@NotNull TaskFuture<? extends T> delegate) {
       if (myDelegate == null) {
         try {
           myDelegate = delegate;
index adb7e1d389dbc1701444d744dd94cc165bd0f7ed..cbcf081feef70d67e10ec29394fafbc2aa82b926 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.compiler.notNullVerification;
 
+import com.intellij.compiler.instrumentation.FailSafeClassReader;
 import com.intellij.compiler.instrumentation.FailSafeMethodVisitor;
 import org.jetbrains.org.objectweb.asm.*;
 
@@ -55,7 +56,7 @@ public class NotNullVerifyingInstrumenter extends ClassVisitor implements Opcode
     myMethodParamNames = getAllParameterNames(reader);
   }
 
-  public static boolean processClassFile(final ClassReader reader, final ClassVisitor writer) {
+  public static boolean processClassFile(final FailSafeClassReader reader, final ClassVisitor writer) {
     final NotNullVerifyingInstrumenter instrumenter = new NotNullVerifyingInstrumenter(writer, reader);
     reader.accept(instrumenter, 0);
     return instrumenter.isModification();
@@ -124,7 +125,7 @@ public class NotNullVerifyingInstrumenter extends ClassVisitor implements Opcode
   @Override
   public MethodVisitor visitMethod(final int access, final String name, String desc, String signature, String[] exceptions) {
     if ((access & Opcodes.ACC_BRIDGE) != 0) {
-      return super.visitMethod(access, name, desc, signature, exceptions);
+      return new FailSafeMethodVisitor(Opcodes.ASM5, super.visitMethod(access, name, desc, signature, exceptions));
     }
 
     final Type[] args = Type.getArgumentTypes(desc);
index 94b14306be0ce11cfe825b01a291837d76c173e8..60de09471eb6028a1221e89f377cbceaa50dcf46 100644 (file)
@@ -432,7 +432,7 @@ public class Javac2 extends Javac {
         try {
           final FileInputStream inputStream = new FileInputStream(file);
           try {
-            ClassReader reader = new FailSafeClassReader(inputStream);
+            FailSafeClassReader reader = new FailSafeClassReader(inputStream);
 
             int version = getClassFileVersion(reader);
             
index 80471e849780d68005aee346be70666a60ccce68..2d45b34a79a221c89edf6a599eb6a2829bc5d73f 100644 (file)
@@ -46,12 +46,14 @@ import com.intellij.execution.runners.ExecutionUtil;
 import com.intellij.idea.ActionsBundle;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.UserDataHolderBase;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
@@ -65,6 +67,7 @@ import com.intellij.ui.classFilter.ClassFilter;
 import com.intellij.ui.classFilter.DebuggerClassFilterProvider;
 import com.intellij.util.Alarm;
 import com.intellij.util.EventDispatcher;
+import com.intellij.util.ReflectionUtil;
 import com.intellij.util.StringBuilderSpinAllocator;
 import com.intellij.util.concurrency.Semaphore;
 import com.intellij.util.containers.ContainerUtil;
@@ -1228,6 +1231,45 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
     }.start((EvaluationContextImpl)evaluationContext, internalEvaluate);
   }
 
+  static {
+    //noinspection ConstantConditions
+    assert Patches.USE_REFLECTION_TO_ACCESS_JDK8;
+  }
+
+  public Value invokeMethod(final EvaluationContext evaluationContext,
+                            final InterfaceType interfaceType,
+                            final Method method,
+                            final List args) throws EvaluateException {
+    final ThreadReference thread = getEvaluationThread(evaluationContext);
+    return new InvokeCommand<Value>(method, args) {
+      @Override
+      protected Value invokeMethod(int invokePolicy, Method method, List args) throws InvocationException,
+                                                                                      ClassNotLoadedException,
+                                                                                      IncompatibleThreadStateException,
+                                                                                      InvalidTypeException {
+        if (LOG.isDebugEnabled()) {
+          LOG.debug("Invoke " + method.name());
+        }
+        //TODO: remove reflection after move to java 8 or 9, this API was introduced in 1.8.0_45
+        java.lang.reflect.Method invokeMethod =
+          ReflectionUtil.getMethod(InterfaceType.class, "invokeMethod", ThreadReference.class, Method.class, List.class, int.class);
+        if (invokeMethod == null) {
+          throw new IllegalStateException("Interface method invocation is not supported in JVM " +
+                                          SystemInfo.JAVA_VERSION +
+                                          ". Use JVM 1.8.0_45 or higher to run " +
+                                          ApplicationNamesInfo.getInstance().getFullProductName());
+        }
+        try {
+          return (Value)invokeMethod.invoke(interfaceType, thread, method, args, invokePolicy);
+        }
+        catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+      }
+    }.start((EvaluationContextImpl)evaluationContext, false);
+  }
+
+
   @Override
   public ArrayReference newInstance(final ArrayType arrayType,
                                     final int dimension)
index 7387c7ffb0b2bc95c719308e617104ba22571dda..28a3560a7774f768e348b096fe50ae21c6453b2d 100644 (file)
@@ -32,6 +32,7 @@ import com.intellij.debugger.impl.DebuggerUtilsEx;
 import com.intellij.debugger.jdi.VirtualMachineProxyImpl;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.rt.debugger.DefaultMethodInvoker;
+import com.intellij.util.containers.ContainerUtil;
 import com.sun.jdi.*;
 
 import java.util.ArrayList;
@@ -93,7 +94,7 @@ public class MethodEvaluator implements Evaluator {
     if(object == null) {
       throw EvaluateExceptionUtil.createEvaluateException(new NullPointerException());
     }
-    if (!(object instanceof ObjectReference || object instanceof ClassType)) {
+    if (!(object instanceof ObjectReference || isInvokableType(object))) {
       throw EvaluateExceptionUtil.createEvaluateException(DebuggerBundle.message("evaluation.error.evaluating.method", myMethodName));
     }
     List args = new ArrayList(myArgumentEvaluators.length);
@@ -107,9 +108,8 @@ public class MethodEvaluator implements Evaluator {
         // it seems that if we have an object of the class, the class must be ready, so no need to use findClass here
         referenceType = ((ObjectReference)object).referenceType();
       }
-      else if(object instanceof ClassType) {
-        final ClassType qualifierType = (ClassType)object;
-        referenceType = debugProcess.findClass(context, qualifierType.name(), context.getClassLoader());
+      else if (isInvokableType(object)) {
+        referenceType = debugProcess.findClass(context, ((ReferenceType)object).name(), context.getClassLoader());
       }
       else {
         final String className = myClassName != null? myClassName.getName(debugProcess) : null;
@@ -125,18 +125,27 @@ public class MethodEvaluator implements Evaluator {
       }
       final String signature = myMethodSignature != null ? myMethodSignature.getName(debugProcess) : null;
       final String methodName = DebuggerUtilsEx.methodName(referenceType.name(), myMethodName, signature);
-      if (object instanceof ClassType) {
-        if(referenceType instanceof ClassType) {
+      if (isInvokableType(object)) {
+        if (isInvokableType(referenceType)) {
           Method jdiMethod;
-          if(myMethodSignature != null) {
-            jdiMethod = ((ClassType)referenceType).concreteMethodByName(myMethodName, myMethodSignature.getName(debugProcess));
+          if (signature != null) {
+            if (referenceType instanceof ClassType) {
+              jdiMethod = ((ClassType)referenceType).concreteMethodByName(myMethodName, signature);
+            }
+            else {
+              jdiMethod = ContainerUtil.getFirstItem(referenceType.methodsByName(myMethodName, signature));
+            }
           }
           else {
-            List list = referenceType.methodsByName(myMethodName);
-            jdiMethod = (Method)(list.size() > 0 ? list.get(0) : null);
+            jdiMethod = ContainerUtil.getFirstItem(referenceType.methodsByName(myMethodName));
           }
           if (jdiMethod != null && jdiMethod.isStatic()) {
-            return debugProcess.invokeMethod(context, (ClassType)referenceType, jdiMethod, args);
+            if (referenceType instanceof ClassType) {
+              return debugProcess.invokeMethod(context, (ClassType)referenceType, jdiMethod, args);
+            }
+            else {
+              return debugProcess.invokeMethod(context, (InterfaceType)referenceType, jdiMethod, args);
+            }
           }
         }
         throw EvaluateExceptionUtil.createEvaluateException(DebuggerBundle.message("evaluation.error.no.static.method", methodName));
@@ -198,6 +207,10 @@ public class MethodEvaluator implements Evaluator {
     }
   }
 
+  private static boolean isInvokableType(Object type) {
+    return type instanceof ClassType || type instanceof InterfaceType;
+  }
+
   // only methods without arguments for now
   private static Value invokeDefaultMethod(DebugProcess debugProcess, EvaluationContext evaluationContext,
                                            Value obj, String name)
index f2297167207cc8509dedddd9411f5644ed5710bc..b186452c9f1df32eeb6382d5c8c10ea9094d8174 100644 (file)
@@ -17,27 +17,41 @@ package com.intellij.execution.application;
 
 import com.intellij.execution.lineMarker.ExecutorAction;
 import com.intellij.execution.lineMarker.RunLineMarkerContributor;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiIdentifier;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.util.PsiMethodUtil;
+import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Dmitry Avdeev
  */
 public class ApplicationRunLineMarkerProvider extends RunLineMarkerContributor {
-
   @Nullable
   @Override
-  public Info getInfo(PsiElement e) {
+  public Info getInfo(final PsiElement e) {
     if (isIdentifier(e)) {
       PsiElement element = e.getParent();
-      if (element instanceof PsiClass && PsiMethodUtil.findMainInClass((PsiClass)element) != null)
-        return new Info(ApplicationConfigurationType.getInstance().getIcon(), null, ExecutorAction.getActions(0));
-      if (element instanceof PsiMethod && "main".equals(((PsiMethod)element).getName()) && PsiMethodUtil.isMainMethod((PsiMethod)element))
-        return new Info(ApplicationConfigurationType.getInstance().getIcon(), null, ExecutorAction.getActions(0));
+      if (element instanceof PsiClass && PsiMethodUtil.findMainInClass((PsiClass)element) != null ||
+          element instanceof PsiMethod && "main".equals(((PsiMethod)element).getName()) && PsiMethodUtil.isMainMethod((PsiMethod)element)) {
+        final AnAction[] actions = ExecutorAction.getActions(0);
+        return new Info(ApplicationConfigurationType.getInstance().getIcon(), new Function<PsiElement, String>() {
+          @Override
+          public String fun(final PsiElement element) {
+            return StringUtil.join(ContainerUtil.mapNotNull(actions, new Function<AnAction, String>() {
+              @Override
+              public String fun(AnAction action) {
+                return getText(action, element);
+              }
+            }), "\n");
+          }
+        }, actions);
+      }
     }
     return null;
   }
index 5f8722a7b119746c75c4fed8b14f4adfee830d2a..9cf99e57696e2bd36853f3d4b9ce9606b4899498 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInsight.daemon.impl.analysis;
 
+import com.intellij.codeInsight.AnnotationTargetUtil;
 import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.JavaErrorMessages;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
@@ -212,8 +213,8 @@ public class AnnotationsHighlightUtil {
 
       PsiClass container = getRepeatableContainer(metaAnno);
       if (container != null) {
-        PsiAnnotation.TargetType[] targets = PsiImplUtil.getTargetsForLocation(owner);
-        PsiAnnotation.TargetType applicable = PsiImplUtil.findApplicableTarget(container, targets);
+        PsiAnnotation.TargetType[] targets = AnnotationTargetUtil.getTargetsForLocation(owner);
+        PsiAnnotation.TargetType applicable = AnnotationTargetUtil.findAnnotationTarget(container, targets);
         if (applicable == null) {
           String target = JavaErrorMessages.message("annotation.target." + targets[0]);
           String message = JavaErrorMessages.message("annotation.container.not.applicable", container.getName(), target);
@@ -323,7 +324,7 @@ public class AnnotationsHighlightUtil {
     if (type != null && type.accept(AnnotationReturnTypeVisitor.INSTANCE).booleanValue()) {
       return null;
     }
-    String description = JavaErrorMessages.message("annotation.invalid.annotation.member.type", type != null ? type.getPresentableText() : type);
+    String description = JavaErrorMessages.message("annotation.invalid.annotation.member.type", type != null ? type.getPresentableText() : null);
     return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(typeElement).descriptionAndTooltip(description).create();
   }
 
@@ -344,7 +345,7 @@ public class AnnotationsHighlightUtil {
     if (nameRef == null) return null;
 
     PsiAnnotationOwner owner = annotation.getOwner();
-    PsiAnnotation.TargetType[] targets = PsiImplUtil.getTargetsForLocation(owner);
+    PsiAnnotation.TargetType[] targets = AnnotationTargetUtil.getTargetsForLocation(owner);
     if (owner == null || targets.length == 0) {
       String message = JavaErrorMessages.message("annotation.not.allowed.here");
       return annotationError(annotation, message);
@@ -355,7 +356,7 @@ public class AnnotationsHighlightUtil {
       if (info != null) return info;
     }
 
-    PsiAnnotation.TargetType applicable = PsiImplUtil.findApplicableTarget(annotation, targets);
+    PsiAnnotation.TargetType applicable = AnnotationTargetUtil.findAnnotationTarget(annotation, targets);
     if (applicable == PsiAnnotation.TargetType.UNKNOWN) return null;
 
     if (applicable == null) {
@@ -673,9 +674,9 @@ public class AnnotationsHighlightUtil {
       }
     }
 
-    Set<PsiAnnotation.TargetType> repeatableTargets = PsiImplUtil.getAnnotationTargets((PsiClass)target);
+    Set<PsiAnnotation.TargetType> repeatableTargets = AnnotationTargetUtil.getAnnotationTargets((PsiClass)target);
     if (repeatableTargets != null) {
-      Set<PsiAnnotation.TargetType> containerTargets = PsiImplUtil.getAnnotationTargets(container);
+      Set<PsiAnnotation.TargetType> containerTargets = AnnotationTargetUtil.getAnnotationTargets(container);
       if (containerTargets != null && !repeatableTargets.containsAll(containerTargets)) {
         return JavaErrorMessages.message("annotation.container.wide.target", container.getQualifiedName());
       }
@@ -766,6 +767,7 @@ public class AnnotationsHighlightUtil {
         if (field instanceof PsiEnumConstant) {
           String name = ((PsiEnumConstant)field).getName();
           try {
+            //noinspection ConstantConditions
             return Enum.valueOf(RetentionPolicy.class, name);
           }
           catch (Exception e) {
index c24803d73a41a201c8c608d9b4078253184a356e..4ce4217331072e8bc36562bb215c4f339762ae3f 100644 (file)
@@ -1317,24 +1317,14 @@ public class GenericsHighlightUtil {
 
   static HighlightInfo checkInferredIntersections(PsiSubstitutor substitutor, TextRange ref) {
     for (Map.Entry<PsiTypeParameter, PsiType> typeEntry : substitutor.getSubstitutionMap().entrySet()) {
+      final String parameterName = typeEntry.getKey().getName();
       final PsiType type = typeEntry.getValue();
       if (type instanceof PsiIntersectionType) {
-        final PsiType[] conjuncts = ((PsiIntersectionType)type).getConjuncts();
-        for (int i = 0; i < conjuncts.length; i++) {
-          PsiClass conjunct = PsiUtil.resolveClassInClassTypeOnly(conjuncts[i]);
-          if (conjunct != null && !conjunct.isInterface()) {
-            for (int i1 = i + 1; i1 < conjuncts.length; i1++) {
-              PsiClass oppositeConjunct = PsiUtil.resolveClassInClassTypeOnly(conjuncts[i1]);
-              if (oppositeConjunct != null && !oppositeConjunct.isInterface()) {
-                if (!conjunct.isInheritor(oppositeConjunct, true) && !oppositeConjunct.isInheritor(conjunct, true)) {
-                  return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
-                    .descriptionAndTooltip("Type parameter " + typeEntry.getKey().getName() + " has incompatible upper bounds: " +
-                                           conjunct.getName() + " and " + oppositeConjunct.getName())
-                    .range(ref).create();
-                }
-              }
-            }
-          }
+        final String conflictingConjunctsMessage = ((PsiIntersectionType)type).getConflictingConjunctsMessage();
+        if (conflictingConjunctsMessage != null) {
+          return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
+            .descriptionAndTooltip("Type parameter " + parameterName + " has incompatible upper bounds: " + conflictingConjunctsMessage)
+            .range(ref).create();
         }
       }
     }
index 0dc6c8fca8eb91164eaf7da241c9e2c372cfc1ea..426170abe4aa635f1b8a85908987f1543b367c18 100644 (file)
@@ -35,7 +35,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiSuperMethodImplUtil;
-import com.intellij.psi.impl.source.resolve.graphInference.InferenceSession;
 import com.intellij.psi.infos.CandidateInfo;
 import com.intellij.psi.infos.MethodCandidateInfo;
 import com.intellij.psi.util.*;
@@ -363,6 +362,13 @@ public class HighlightMethodUtil {
         if (highlightInfo == null) {
           highlightInfo = checkVarargParameterErasureToBeAccessible((MethodCandidateInfo)resolveResult, methodCall);
         }
+
+        if (highlightInfo == null && resolveResult instanceof MethodCandidateInfo) {
+          final String errorMessage = ((MethodCandidateInfo)resolveResult).getInferenceErrorMessage();
+          if (errorMessage != null) {
+            highlightInfo = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).descriptionAndTooltip(errorMessage).range(fixRange).create();
+          }
+        }
       }
     }
     else {
@@ -781,20 +787,21 @@ public class HighlightMethodUtil {
     PsiClass aClass = method.getContainingClass();
     PsiParameter[] parameters = method.getParameterList().getParameters();
     String methodName = method.getName();
-    return createMismatchedArgumentsHtmlTooltip(list, parameters, methodName, substitutor, aClass);
+    return createMismatchedArgumentsHtmlTooltip(list, info, parameters, methodName, substitutor, aClass);
   }
 
   private static String createShortMismatchedArgumentsHtmlTooltip(PsiExpressionList list,
-                                                             PsiParameter[] parameters,
-                                                             String methodName,
-                                                             PsiSubstitutor substitutor,
-                                                             PsiClass aClass) {
+                                                                  @Nullable MethodCandidateInfo info, 
+                                                                  PsiParameter[] parameters,
+                                                                  String methodName,
+                                                                  PsiSubstitutor substitutor,
+                                                                  PsiClass aClass) {
     PsiExpression[] expressions = list.getExpressions();
     int cols = Math.max(parameters.length, expressions.length);
 
     @Language("HTML")
     @NonNls String parensizedName = methodName + (parameters.length == 0 ? "(&nbsp;)&nbsp;" : "");
-    final String errorMessage = InferenceSession.getInferenceErrorMessage(list.getParent());
+    final String errorMessage = info != null ? info.getInferenceErrorMessage() : null;
     return JavaErrorMessages.message(
       "argument.mismatch.html.tooltip",
       Integer.valueOf(cols - parameters.length + 1), parensizedName,
@@ -833,22 +840,24 @@ public class HighlightMethodUtil {
   }
 
   private static String createMismatchedArgumentsHtmlTooltip(PsiExpressionList list,
+                                                             MethodCandidateInfo info, 
                                                              PsiParameter[] parameters,
                                                              String methodName,
                                                              PsiSubstitutor substitutor,
                                                              PsiClass aClass) {
     return Math.max(parameters.length, list.getExpressions().length) <= 2
-           ? createShortMismatchedArgumentsHtmlTooltip(list, parameters, methodName, substitutor, aClass)
-           : createLongMismatchedArgumentsHtmlTooltip(list, parameters, methodName, substitutor, aClass);
+           ? createShortMismatchedArgumentsHtmlTooltip(list, info, parameters, methodName, substitutor, aClass)
+           : createLongMismatchedArgumentsHtmlTooltip(list, info, parameters, methodName, substitutor, aClass);
   }
 
   @SuppressWarnings("StringContatenationInLoop")
   @Language("HTML")
   private static String createLongMismatchedArgumentsHtmlTooltip(PsiExpressionList list,
-                                                             PsiParameter[] parameters,
-                                                             String methodName,
-                                                             PsiSubstitutor substitutor,
-                                                             PsiClass aClass) {
+                                                                 @Nullable MethodCandidateInfo info, 
+                                                                 PsiParameter[] parameters,
+                                                                 String methodName,
+                                                                 PsiSubstitutor substitutor,
+                                                                 PsiClass aClass) {
     PsiExpression[] expressions = list.getExpressions();
 
     @SuppressWarnings("NonConstantStringShouldBeStringBuffer") @NonNls
@@ -904,7 +913,7 @@ public class HighlightMethodUtil {
     }
 
     s+= "</table>";
-    final String errorMessage = InferenceSession.getInferenceErrorMessage(list.getParent());
+    final String errorMessage = info != null ? info.getInferenceErrorMessage() : null;
     if (errorMessage != null) {
       s+= "reason: "; 
       s += XmlStringUtil.escapeString(errorMessage).replaceAll("\n", "<br/>");
@@ -1459,7 +1468,7 @@ public class HighlightMethodUtil {
         String constructorName = aClass.getName();
         String argTypes = buildArgTypesList(list);
         String description = JavaErrorMessages.message("wrong.constructor.arguments", constructorName+"()", argTypes);
-        String tooltip = createMismatchedArgumentsHtmlTooltip(list, PsiParameter.EMPTY_ARRAY, constructorName, PsiSubstitutor.EMPTY, aClass);
+        String tooltip = createMismatchedArgumentsHtmlTooltip(list, null, PsiParameter.EMPTY_ARRAY, constructorName, PsiSubstitutor.EMPTY, aClass);
         HighlightInfo info = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(list).description(description).escapedToolTip(tooltip).navigationShift(+1).create();
         QuickFixAction.registerQuickFixAction(info, constructorCall.getTextRange(), QUICK_FIX_FACTORY.createCreateConstructorFromCallFix(constructorCall));
         if (classReference != null) {
index 2d3c1218afb07d8d6605055c0c586a4b726fd62f..c6569c11c06e4991f87df5813e6e1c86d694c000 100644 (file)
@@ -38,9 +38,9 @@ import com.intellij.psi.*;
 import com.intellij.psi.controlFlow.ControlFlowUtil;
 import com.intellij.psi.impl.source.javadoc.PsiDocMethodOrFieldRef;
 import com.intellij.psi.impl.source.resolve.JavaResolveUtil;
-import com.intellij.psi.impl.source.resolve.graphInference.InferenceSession;
 import com.intellij.psi.impl.source.resolve.graphInference.PsiPolyExpressionUtil;
 import com.intellij.psi.impl.source.tree.java.PsiReferenceExpressionImpl;
+import com.intellij.psi.infos.MethodCandidateInfo;
 import com.intellij.psi.javadoc.PsiDocComment;
 import com.intellij.psi.javadoc.PsiDocTagValue;
 import com.intellij.psi.util.*;
@@ -324,7 +324,14 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
           else {
             if (!LambdaUtil.isLambdaFullyInferred(expression, functionalInterfaceType) && !expression.hasFormalParameterTypes()) {
               final PsiCallExpression callExpression = PsiTreeUtil.getParentOfType(expression, PsiCallExpression.class);
-              String description = callExpression != null ? InferenceSession.getInferenceErrorMessage(callExpression) : null;
+              String description;
+              if (callExpression != null) {
+                final JavaResolveResult result = callExpression.resolveMethodGenerics();
+                description = result instanceof MethodCandidateInfo ? ((MethodCandidateInfo)result).getInferenceErrorMessage() : null;
+              }
+              else {
+                description = null;
+              }
               if (description == null) {
                 description = "Cyclic inference";
               }
index 30eae15890a5380b2a9639bb6bb1354638ddac4b..fe0a493aebdcf5dbd89df177ced2f8870e60c095 100644 (file)
@@ -255,7 +255,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
 
     setVariableState(var, getVariableState(var).withValue(value));
     if (value instanceof DfaTypeValue) {
-      setVariableState(var, getVariableState(var).withNullable(((DfaTypeValue)value).isNullable()));
+      setVariableState(var, getVariableState(var).withNullability(((DfaTypeValue)value).getNullness()));
       DfaRelationValue dfaInstanceof = myFactory.getRelationFactory().createRelation(var, value, JavaTokenType.INSTANCEOF_KEYWORD, false);
       if (((DfaTypeValue)value).isNotNull()) {
         applyCondition(dfaInstanceof);
@@ -848,6 +848,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
     }
     else { // Not Equals
       if (c1Index.equals(c2Index) || areCompatibleConstants(c1Index, c2Index)) return false;
+      if (isNull(dfaLeft) && isPrimitive(dfaRight) || isNull(dfaRight) && isPrimitive(dfaLeft)) return true;
       makeClassesDistinct(c1Index, c2Index);
       myCachedDistinctClassPairs = null;
       myCachedHash = null;
@@ -856,6 +857,10 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
     return true;
   }
 
+  private static boolean isPrimitive(DfaValue value) {
+    return value instanceof DfaVariableValue && ((DfaVariableValue)value).getVariableType() instanceof PsiPrimitiveType;
+  }
+
   private static boolean preserveConstantDistinction(final Object c1, final Object c2) {
     return c1 == null && c2 instanceof PsiEnumConstant ||
            c2 == null && c1 instanceof PsiEnumConstant;
index f6f72dbb32d7912898461b75ef1964dc2d99808d..0e5c8d6bb79f835e7fadd2d47f923a70491b945d 100644 (file)
@@ -66,7 +66,7 @@ public class DfaPsiUtil {
 
   @NotNull
   public static Nullness getElementNullability(@Nullable PsiType resultType, @Nullable PsiModifierListOwner owner) {
-    if (owner == null) {
+    if (owner == null || resultType instanceof PsiPrimitiveType) {
       return Nullness.UNKNOWN;
     }
 
index ed52d2c5e78be5eb13a898d06a1b7e5df14ab515..126c48ff5fc507696fb8d8902da684ad229c3ebe 100644 (file)
@@ -66,10 +66,11 @@ public class StandardInstructionVisitor extends InstructionVisitor {
     if (dfaDest instanceof DfaVariableValue) {
       DfaVariableValue var = (DfaVariableValue) dfaDest;
 
-      if (var.getInherentNullability() == Nullness.NOT_NULL) {
+      final PsiModifierListOwner psi = var.getPsiVariable();
+      boolean forceDeclaredNullity = !(psi instanceof PsiParameter && psi.getParent() instanceof PsiParameterList);
+      if (forceDeclaredNullity && var.getInherentNullability() == Nullness.NOT_NULL) {
         checkNotNullable(memState, dfaSource, NullabilityProblem.assigningToNotNull, instruction.getRExpression());
       }
-      final PsiModifierListOwner psi = var.getPsiVariable();
       if (!(psi instanceof PsiField) || !psi.hasModifierProperty(PsiModifier.VOLATILE)) {
         memState.setVarValue(var, dfaSource);
       }
index 353095205f0ef0c4a6c42e9b9ab906e96fd66097..dd194208106a6ed5d6ec16059cea3cda819f8c8b 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInsight.completion;
 
+import com.intellij.codeInsight.AnnotationTargetUtil;
 import com.intellij.codeInsight.ExceptionUtil;
 import com.intellij.codeInsight.completion.scope.JavaCompletionProcessor;
 import com.intellij.codeInsight.lookup.LookupElement;
@@ -25,7 +26,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.patterns.ElementPattern;
 import com.intellij.psi.*;
 import com.intellij.psi.filters.getters.MembersGetter;
-import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.psi.impl.source.tree.JavaElementType;
 import com.intellij.psi.util.InheritanceUtil;
 import com.intellij.psi.util.PropertyUtil;
@@ -128,11 +128,11 @@ public class PreferByKindWeigher extends LookupElementWeigher {
     if (psiElement().withParents(PsiJavaCodeReferenceElement.class, PsiAnnotation.class).accepts(position)) {
       final PsiAnnotation annotation = PsiTreeUtil.getParentOfType(position, PsiAnnotation.class);
       assert annotation != null;
-      final PsiAnnotation.TargetType[] targets = PsiImplUtil.getTargetsForLocation(annotation.getOwner());
+      final PsiAnnotation.TargetType[] targets = AnnotationTargetUtil.getTargetsForLocation(annotation.getOwner());
       return new Condition<PsiClass>() {
         @Override
         public boolean value(PsiClass psiClass) {
-          return psiClass.isAnnotationType() && PsiImplUtil.findApplicableTarget(psiClass, targets) != null;
+          return psiClass.isAnnotationType() && AnnotationTargetUtil.findAnnotationTarget(psiClass, targets) != null;
         }
       };
     }
index 6069486d38c9738126e6814b238ed3cf75288083..5ef6d1737af4e507cc82ef5c2264c86f8bfc4e4c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -126,11 +126,11 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
       }
     });
     final List<PsiElement> cleanupElements = new ArrayList<PsiElement>(); 
-    final ArrayList<PsiMethod> constrs = filterConstructorsIfFieldAlreadyAssigned(constructors, getField());
-    if (constrs.size() > 1) {
-      final PsiMethodMember[] members = new PsiMethodMember[constrs.size()];
+    final List<PsiMethod> filtered = filterConstructorsIfFieldAlreadyAssigned(constructors, getField());
+    if (filtered.size() > 1) {
+      final PsiMethodMember[] members = new PsiMethodMember[filtered.size()];
       int i = 0;
-      for (PsiMethod constructor : constrs) {
+      for (PsiMethod constructor : filtered) {
         members[i++] = new PsiMethodMember(constructor);
       }
       final List<PsiMethodMember> elements;
@@ -138,7 +138,7 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
         elements = Arrays.asList(members);
       } else {
         final MemberChooser<PsiMethodMember> chooser = new MemberChooser<PsiMethodMember>(members, false, true, project);
-        chooser.setTitle("Choose constructors to add parameter to");
+        chooser.setTitle("Choose Constructors to Add Parameter to");
         chooser.show();
         elements = chooser.getSelectedElements();
         if (elements == null) return;
@@ -149,11 +149,11 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
           break;
         }
       }
-
-    } else if (!constrs.isEmpty()) {
+    }
+    else if (!filtered.isEmpty()) {
       final Collection<SmartPsiElementPointer<PsiField>> fieldsToFix = getFieldsToFix();
       try {
-        final PsiMethod constructor = constrs.get(0);
+        final PsiMethod constructor = filtered.get(0);
         final LinkedHashSet<PsiField> fields = new LinkedHashSet<PsiField>();
         getFieldsToFix().add(myField);
         for (SmartPsiElementPointer<PsiField> elementPointer : fieldsToFix) {
@@ -162,7 +162,7 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
             fields.add(field);
           }
         }
-        if (constrs.size() == constructors.length && fields.size() > 1 && !ApplicationManager.getApplication().isUnitTestMode()) {
+        if (filtered.size() == constructors.length && fields.size() > 1 && !ApplicationManager.getApplication().isUnitTestMode()) {
           PsiFieldMember[] members = new PsiFieldMember[fields.size()];
           int i = 0;
           for (PsiField field : fields) {
@@ -180,7 +180,7 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
           }
         }
 
-        addParameterToConstructor(project, file, editor, constructor, constrs.size() == constructors.length
+        addParameterToConstructor(project, file, editor, constructor, filtered.size() == constructors.length
                                                                       ? fields.toArray(new PsiField[fields.size()])
                                                                       : new PsiField[]{getField()}, cleanupElements);
       }
@@ -222,8 +222,8 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
     };
   }
 
-  private static ArrayList<PsiMethod> filterConstructorsIfFieldAlreadyAssigned(PsiMethod[] constructors, PsiField field) {
-    final ArrayList<PsiMethod> result = new ArrayList<PsiMethod>(Arrays.asList(constructors));
+  private static List<PsiMethod> filterConstructorsIfFieldAlreadyAssigned(PsiMethod[] constructors, PsiField field) {
+    final List<PsiMethod> result = new ArrayList<PsiMethod>(Arrays.asList(constructors));
     for (PsiReference reference : ReferencesSearch.search(field, new LocalSearchScope(constructors))) {
       final PsiElement element = reference.getElement();
       if (element instanceof PsiReferenceExpression && PsiUtil.isOnAssignmentLeftHand((PsiExpression)element)) {
@@ -246,7 +246,7 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
     Collections.sort(params, new FieldParameterComparator(parameterList));
 
     int i = 0;
-    final HashMap<PsiField, String> usedFields = new HashMap<PsiField, String>();
+    final Map<PsiField, String> usedFields = new HashMap<PsiField, String>();
     final MultiMap<PsiType, PsiVariable> types = new MultiMap<PsiType, PsiVariable>();
     for (PsiVariable param : params) {
       types.putValue(param.getType(), param);
@@ -299,12 +299,12 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
     }, ", ") + "){}";
   }
 
-  private static String getUniqueParameterName(PsiParameter[] parameters, PsiVariable variable, HashMap<PsiField, String> usedNames) {
-    final JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(variable.getProject());
-    final SuggestedNameInfo nameInfo = styleManager
-      .suggestVariableName(VariableKind.PARAMETER,
-                           styleManager.variableNameToPropertyName(variable.getName(), VariableKind.FIELD),
-                           null, variable.getType());
+  private static String getUniqueParameterName(PsiParameter[] parameters, PsiVariable variable, Map<PsiField, String> usedNames) {
+    String name = variable.getName();
+    assert name != null : variable;
+    JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(variable.getProject());
+    name = styleManager.variableNameToPropertyName(name, VariableKind.FIELD);
+    SuggestedNameInfo nameInfo = styleManager.suggestVariableName(VariableKind.PARAMETER, name, null, variable.getType());
     String newName = nameInfo.names[0];
     int n = 1;
     while (true) {
@@ -317,7 +317,7 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
     return newName;
   }
 
-  private static boolean isUnique(PsiParameter[] params, String newName, HashMap<PsiField, String> usedNames) {
+  private static boolean isUnique(PsiParameter[] params, String newName, Map<PsiField, String> usedNames) {
     if (usedNames.containsValue(newName)) return false;
     for (PsiParameter parameter : params) {
       if (Comparing.strEqual(parameter.getName(), newName)) {
@@ -328,12 +328,12 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
   }
 
   private static boolean doCreate(Project project, Editor editor, PsiParameter[] parameters, SmartPsiElementPointer constructorPointer,
-                                  ParameterInfoImpl[] parameterInfos, HashMap<PsiField, String> fields, List<PsiElement> cleanupElements) {
+                                  ParameterInfoImpl[] parameterInfos, Map<PsiField, String> fields, List<PsiElement> cleanupElements) {
     PsiMethod constructor = (PsiMethod)constructorPointer.getElement();
     assert constructor != null;
     PsiParameter[] newParameters = constructor.getParameterList().getParameters();
     if (newParameters == parameters) return false; //user must have canceled dialog
-    // do not introduce assignment in chanined constructor
+    // do not introduce assignment in chained constructor
     if (JavaHighlightUtil.getChainedConstructors(constructor) == null) {
       boolean created = false;
       for (PsiField field : fields.keySet()) {
@@ -342,7 +342,7 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
         if (parameter == null) {
           continue;
         }
-        notNull(field, parameter);
+        NullableNotNullManager.getInstance(field.getProject()).copyNotNullAnnotation(field, parameter);
         cleanupElements.add(parameter);
         final PsiElement assignmentStatement = AssignFieldFromParameterAction.addFieldAssignmentStatement(project, field, parameter, editor);
         if (assignmentStatement != null) {
@@ -356,13 +356,6 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
     }
   }
 
-  private static void notNull(PsiField field, PsiParameter parameter) {
-    final PsiAnnotation notNull = NullableNotNullManager.getInstance(field.getProject()).copyNotNullAnnotation(field);
-    if (notNull != null) {
-      parameter.getModifierList().addBefore(notNull, null);
-    }
-  }
-
   @Nullable
   private static PsiParameter findParamByName(String newName,
                                               PsiType type,
index e6991736c0e3d2c2ea4539c896f58299f67fa848..192a64cf8d29c3961e96115074107362182d74d7 100644 (file)
@@ -28,6 +28,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
+import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -206,7 +207,7 @@ public abstract class CopyPasteReferenceProcessor<TRef extends PsiElement> exten
     for (int i = 0; i < referenceData.length; i++) {
       PsiElement ref = refs[i];
       if (ref != null) {
-        LOG.assertTrue(ref.isValid());
+        PsiUtilCore.ensureValid(ref);
         Object refObject = refObjects[i];
         boolean found = false;
         for (Object selected : selectedObjects) {
index c4dd73867cb68168b2f9a13a2887c0e0e20dc2d6..e10b9a8a88f2e54f813b04dbe0893013f4113d29 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -33,7 +33,6 @@ import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.ContainerUtil;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -43,6 +42,7 @@ import java.util.List;
 
 public class GenerateConstructorHandler extends GenerateMembersHandlerBase {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.GenerateConstructorHandler");
+
   private boolean myCopyJavadoc;
 
   public GenerateConstructorHandler() {
@@ -54,12 +54,13 @@ public class GenerateConstructorHandler extends GenerateMembersHandlerBase {
     PsiField[] fields = aClass.getFields();
     ArrayList<ClassMember> array = new ArrayList<ClassMember>();
     ImplicitUsageProvider[] implicitUsageProviders = Extensions.getExtensions(ImplicitUsageProvider.EP_NAME);
-    fieldLoop: for (PsiField field : fields) {
+    fieldLoop:
+    for (PsiField field : fields) {
       if (field.hasModifierProperty(PsiModifier.STATIC)) continue;
 
       if (field.hasModifierProperty(PsiModifier.FINAL) && field.getInitializer() != null) continue;
 
-      for(ImplicitUsageProvider provider: implicitUsageProviders) {
+      for (ImplicitUsageProvider provider : implicitUsageProviders) {
         if (provider.isImplicitWrite(field)) continue fieldLoop;
       }
       array.add(new PsiFieldMember(field));
@@ -70,7 +71,7 @@ public class GenerateConstructorHandler extends GenerateMembersHandlerBase {
   @Override
   @Nullable
   protected ClassMember[] chooseOriginalMembers(PsiClass aClass, Project project) {
-    if (aClass instance