Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 26 Nov 2015 15:46:53 +0000 (16:46 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 26 Nov 2015 15:46:53 +0000 (16:46 +0100)
707 files changed:
.idea/libraries/bouncy_castle.xml [deleted file]
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml [deleted file]
.idea/libraries/http_client.xml
.idea/libraries/javawriter.xml [deleted file]
.idea/libraries/junit_hamcrest.xml [deleted file]
.idea/modules.xml
build/scripts/libLicenses.gant
build/scripts/utils.gant
colorSchemes/src/colorSchemes/WarmNeon.xml
colorSchemes/src/colorSchemes/all_hallows_eve.xml
colorSchemes/src/colorSchemes/blackboard.xml
colorSchemes/src/colorSchemes/cobalt.xml
colorSchemes/src/colorSchemes/github.xml
colorSchemes/src/colorSchemes/monokai.xml
colorSchemes/src/colorSchemes/rails_casts.xml
colorSchemes/src/colorSchemes/twilight.xml
colorSchemes/src/colorSchemes/vibrant_ink.xml
images/src/org/intellij/images/editor/ImageEditor.java
images/src/org/intellij/images/editor/impl/ImageEditorImpl.java
images/src/org/intellij/images/editor/impl/ImageEditorManagerImpl.java
images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
java/execution/impl/src/com/intellij/execution/stacktrace/StackTraceLine.java
java/execution/openapi/src/com/intellij/execution/process/DefaultJavaProcessHandler.java
java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/HardcodedContracts.java
java/java-analysis-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspectionBase.java
java/java-analysis-impl/src/com/intellij/codeInspection/java15api/api1.9.txt [new file with mode: 0644]
java/java-impl/src/com/intellij/codeInsight/intention/impl/FieldFromParameterUtils.java
java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
java/java-impl/src/com/intellij/codeInspection/CollectionAddAllCanBeReplacedWithConstructorInspection.java
java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiFieldFavoriteNodeProvider.java
java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiMethodFavoriteNodeProvider.java
java/java-impl/src/com/intellij/lang/java/JavaRefactoringSupportProvider.java
java/java-impl/src/com/intellij/refactoring/actions/IntroduceFunctionalParameterAction.java [deleted file]
java/java-impl/src/com/intellij/refactoring/actions/IntroduceFunctionalParameterHandler.java [new file with mode: 0644]
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
java/java-impl/src/com/intellij/refactoring/typeMigration/ClassTypeArgumentMigrationProcessor.java
java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java
java/java-impl/src/com/intellij/refactoring/typeMigration/Util.java
java/java-impl/src/com/intellij/refactoring/typeMigration/rules/RootTypeConversionRule.java
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
java/java-psi-api/src/com/intellij/psi/PsiArrayType.java
java/java-psi-api/src/com/intellij/psi/PsiClassType.java
java/java-psi-api/src/com/intellij/psi/PsiEllipsisType.java
java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java
java/java-psi-api/src/com/intellij/psi/PsiType.java
java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java
java/java-psi-api/src/com/intellij/psi/TypeAnnotationProvider.java [new file with mode: 0644]
java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java
java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
java/java-psi-impl/src/com/intellij/psi/PsiTypeMapper.java
java/java-psi-impl/src/com/intellij/psi/impl/TypeCorrector.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImmediateClassType.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveCache.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/FunctionalInterfaceParameterizationUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSessionContainer.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InitialInferenceState.java [new file with mode: 0644]
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/PsiGraphInferenceHelper.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/PsiPolyExpressionUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/CheckedExceptionCompatibilityConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/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/resolve/graphInference/constraints/PsiMethodReferenceCompatibilityConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeCompatibilityConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java
java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PropertyGroup.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57336.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57313.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57314.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57322.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57340.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57387.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57439.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57494.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57495.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57533.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA67744.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA67745.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA93713.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEADEV10459.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEADEV57343.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/RejectContradictingEqualsBounds.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/SuperWildcardCapturedSuperExtendsWildcardCapturedExtends.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/Variance.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/WildcardBoundsCombination.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/WildcardsBoundsIntersection.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlightingGenerated8/UnrelatedClasses.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/expressions/MethodOverloadsInsideLambdaHierarchy.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/IDEA128101.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/InferenceFromNotEqualTypeParamsBounds.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/NoInferenceResult.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/TypeArgsConsistency.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/TypeArgsConsistencyMisc1.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/TypeArgsConsistencyWithoutParams.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/incomplete/InsideParenthesis.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/inference/SimpleCyclicInference.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/ConstructorAssignability.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/InferenceFromReturnType.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/mostSpecific/EnsureArgTypesAreNotCalculatedDuringOverload.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/AcceptInferredVariablesBeforeAdditionalConstraintsLeadToFail.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/CheckedExceptionsConstraintsSubstitutions1.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/IDEA106670.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/IncludeConstraintsWhenParentMethodIsDuringCalculation.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/LiftedIntersectionType.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressionsNoFormalParams.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/OnlyLambdaAtTypeParameterPlace.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/RecursiveCalls.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/IncompleteMethodReferenceWithUncheckedWarningInspection.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/PotentialApplicability.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/FunctionalInterfaceIncompatibilityBasedOnAbsenceOfVoidToTypeConvertion.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/params/FormalParams.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/params/MethodApplicability.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/regression/IDEA131282.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/regression/IDEA134945.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/wildcardParametrization/PrimitiveParameterTypes.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromParameter/afterNotNullNotFinal.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromParameter/beforeNotNullNotFinal.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/documentation/LinkToPackageSummaryWithReference.html [new file with mode: 0644]
java/java-tests/testData/codeInsight/documentation/library-javadoc.jar
java/java-tests/testData/codeInsight/documentation/library-src.jar
java/java-tests/testData/codeInsight/documentation/library.jar
java/java-tests/testData/codeInsight/externalJavadoc/packageSummaryJava8/expected.html [new file with mode: 0644]
java/java-tests/testData/codeInsight/externalJavadoc/packageSummaryJava8/package-info.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/externalJavadoc/packageSummaryJava8/package-summary.html [new file with mode: 0644]
java/java-tests/testData/codeInsight/javadocIG/escapingInLiteral.html [new file with mode: 0644]
java/java-tests/testData/codeInsight/javadocIG/escapingInLiteral.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/javadocIG/htmlLinkToPackageInfo/pack/A.html [new file with mode: 0644]
java/java-tests/testData/codeInsight/javadocIG/htmlLinkToPackageInfo/pack/A.java [new file with mode: 0644]
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/afterAddAllWithReferences.java
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/afterSimple.java
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/afterSplitDeclarationAndAssignment.java
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/afterUseParameter.java [new file with mode: 0644]
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/beforeAddAllWithReferences.java
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/beforeAddAllWithReferencesNotShown.java
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/beforeNotShown1.java [new file with mode: 0644]
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/beforeNotShown2.java [new file with mode: 0644]
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/beforeNotShown3.java [new file with mode: 0644]
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/beforeNotShown4.java [new file with mode: 0644]
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/beforeSequentalAddAllExists.java [new file with mode: 0644]
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/beforeSimple.java
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/beforeSplitDeclarationAndAssignment.java
java/java-tests/testData/inspection/collectionAddAllCanBeReplacedWithConstructor/beforeUseParameter.java [new file with mode: 0644]
java/java-tests/testData/inspection/dataFlow/fixture/AssertThat.java
java/java-tests/testData/refactoring/introduceVariable/LambdaExprNotAccepted.after.java
java/java-tests/testData/refactoring/introduceVariable/LambdaExprNotAccepted.java
java/java-tests/testSrc/com/intellij/codeInsight/JavaExternalDocumentationTest.java
java/java-tests/testSrc/com/intellij/codeInsight/ParameterInfoTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Java8ExpressionsCheckTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Java8RegressionTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MostSpecificResolutionTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromParameterTest.java
java/java-tests/testSrc/com/intellij/codeInsight/javadoc/ExternalJavadocPresentationTest.java
java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
java/java-tests/testSrc/com/intellij/codeInspection/OfflineIRVTest.java
java/java-tests/testSrc/com/intellij/index/IndexTest.groovy
java/java-tests/testSrc/com/intellij/navigation/ChooseByNameTest.groovy
java/java-tests/testSrc/com/intellij/psi/impl/smartPointers/SmartPsiElementPointersTest.java
java/java-tests/testSrc/com/intellij/roots/ModuleScopesTest.java
java/testFramework/src/com/intellij/compiler/CompilerTestUtil.java
java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java
java/testFramework/src/com/intellij/testFramework/CompilerTester.java
java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationVariableTypeFixProvider.java
java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/GuavaInspection.java
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/FluentIterableConversionUtil.java
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaFluentIterableConversionRule.java
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaPredicateConversionRule.java
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/LambdaParametersTypeConversionDescriptor.java
java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java
java/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java
java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java
java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java
java/typeMigration/testData/inspections/guava/convertImmutableCollections.java [new file with mode: 0644]
java/typeMigration/testData/inspections/guava/convertImmutableCollections_after.java [new file with mode: 0644]
java/typeMigration/testData/inspections/guava/copyInto.java
java/typeMigration/testData/inspections/guava/copyInto_after.java
java/typeMigration/testData/inspections/guava/toArray2.java [new file with mode: 0644]
java/typeMigration/testData/inspections/guava/toArray2_after.java [new file with mode: 0644]
java/typeMigration/testData/inspections/guava/toArray3.java [new file with mode: 0644]
java/typeMigration/testData/inspections/guava/toArray3_after.java [new file with mode: 0644]
java/typeMigration/testData/inspections/guava/toArray_after.java
java/typeMigration/testData/inspections/guava/uniqueIndex.java [new file with mode: 0644]
java/typeMigration/testData/inspections/guava/uniqueIndex_after.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/migrateTypeSignature/migrateAnonymousClassTypeParameters/after/Test.items [new file with mode: 0644]
java/typeMigration/testData/refactoring/migrateTypeSignature/migrateAnonymousClassTypeParameters/after/Test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/migrateTypeSignature/migrateAnonymousClassTypeParameters/before/Test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/migrateTypeSignature/migrateAnonymousClassTypeParameters2/after/Test.items [new file with mode: 0644]
java/typeMigration/testData/refactoring/migrateTypeSignature/migrateAnonymousClassTypeParameters2/after/Test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/migrateTypeSignature/migrateAnonymousClassTypeParameters2/before/Test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/propagateViaEquals/after/Test.items [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/propagateViaEquals/after/test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/propagateViaEquals/before/test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t141/after/Test.items [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t141/after/test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t141/before/test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t142/after/Test.items [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t142/after/test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t142/before/test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t143/after/Test.items [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t143/after/test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t143/before/test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t144/after/Test.items [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t144/after/test.java [new file with mode: 0644]
java/typeMigration/testData/refactoring/typeMigration/t144/before/test.java [new file with mode: 0644]
jps/jps-builders/src/org/jetbrains/jps/cmdline/LogSetup.java
jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/RmiStubsGenerator.java
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
jps/jps-builders/src/org/jetbrains/jps/javac/ExternalJavacManager.java
jps/standalone-builder/src/com/intellij/openapi/diagnostic/CompositeLogger.java
jps/standalone-builder/src/org/jetbrains/jps/gant/Log4jFileLoggerFactory.java
native/IdeaWin32/IdeaWin32.vcxproj
native/VistaUpdaterLauncher/VistaUpdaterLauncher.sln
native/VistaUpdaterLauncher/VistaUpdaterLauncher/VistaUpdaterLauncher.vcxproj [new file with mode: 0644]
native/VistaUpdaterLauncher/VistaUpdaterLauncher/VistaUpdaterLauncher.vcxproj.filters [new file with mode: 0644]
native/WinLauncher/WinLauncher/WinLauncher.vcxproj
native/breakgen/breakgen.sln
native/breakgen/breakgen.vcxproj [new file with mode: 0644]
native/breakgen/breakgen.vcxproj.filters [new file with mode: 0644]
native/fileWatcher/fileWatcher3.vcxproj
native/focusKiller/HookImportFunction.cpp
native/focusKiller/focusKiller.sln
native/focusKiller/focusKiller.vcxproj [new file with mode: 0644]
native/focusKiller/focusKiller.vcxproj.filters [new file with mode: 0644]
native/jumplistbridge/JumpListBridge.sln [new file with mode: 0644]
native/jumplistbridge/JumpListBridge.vcxproj [new file with mode: 0644]
native/jumplistbridge/JumpListBridge.vcxproj.filters [new file with mode: 0644]
native/jumplistbridge/jumplistbridge.cpp
native/jumplistbridge/stdafx.cpp [new file with mode: 0644]
native/jumplistbridge/stdafx.h [new file with mode: 0644]
native/jumplistbridge/targetver.h [new file with mode: 0644]
native/restarter/restarter.sln
native/restarter/restarter.vcxproj [new file with mode: 0644]
native/restarter/restarter.vcxproj.filters [new file with mode: 0644]
native/runner/runnerw/runnerw.vcxproj
platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonProgressIndicator.java
platform/configuration-store-impl/src/ApplicationStoreImpl.kt
platform/configuration-store-impl/src/ProjectStateStorageManager.kt
platform/configuration-store-impl/src/StateStorageManagerImpl.kt
platform/core-api/src/com/intellij/openapi/application/ApplicationNamesInfo.java
platform/core-api/src/com/intellij/openapi/project/IndexNotReadyException.java
platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
platform/core-api/src/com/intellij/psi/SyntaxTraverser.java
platform/core-api/src/com/intellij/ui/AbstractSizeAdjustingIcon.java [new file with mode: 0644]
platform/core-api/src/com/intellij/ui/LayeredIcon.java
platform/core-api/src/com/intellij/ui/RowIcon.java
platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java
platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java
platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
platform/core-impl/src/com/intellij/mock/MockComponentManager.java
platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java
platform/core-impl/src/com/intellij/openapi/vfs/impl/ZipHandler.java
platform/core-impl/src/com/intellij/psi/impl/smartPointers/AnchorElementInfo.java
platform/core-impl/src/com/intellij/psi/impl/smartPointers/ClsElementInfo.java
platform/core-impl/src/com/intellij/psi/impl/smartPointers/MarkerCache.java
platform/core-impl/src/com/intellij/psi/impl/smartPointers/SelfElementInfo.java
platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerManagerImpl.java
platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPsiElementPointerImpl.java
platform/core-impl/src/com/intellij/psi/impl/source/tree/LightTreeUtil.java
platform/diff-api/src/com/intellij/diff/DiffExtension.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonMergeUtilTestBase.kt
platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilTestBase.kt
platform/duplicates-analysis/src/com/intellij/dupLocator/index/DuplicatesIndex.java
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleDependencyData.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDataService.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDependencyDataService.java
platform/icons/src/windows/appIconOk512.png [new file with mode: 0644]
platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java
platform/lang-api/src/com/intellij/lang/refactoring/RefactoringSupportProvider.java
platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesModel.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/ManageCodeStyleSchemesDialog.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersUtil.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/AbstractExternalFilter.java
platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java
platform/lang-impl/src/com/intellij/codeInsight/generation/actions/GenerateAction.java
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java
platform/lang-impl/src/com/intellij/codeInspection/ex/PerformFixesModalTask.java
platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionProcessor.java
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesListNode.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeStructure.java
platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
platform/lang-impl/src/com/intellij/ide/fileTemplates/VelocityWrapper.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateGroup.java
platform/lang-impl/src/com/intellij/ide/hierarchy/CallHierarchyBrowserBase.java
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java
platform/lang-impl/src/com/intellij/ide/hierarchy/TypeHierarchyBrowserBase.java
platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java
platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java
platform/lang-impl/src/com/intellij/lang/parser/GeneratedParserUtilBase.java
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/TestEditorManagerImpl.java
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/PsiAwareTextEditorProvider.java
platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java
platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceFunctionalParameterAction.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/tools/Tool.java
platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java
platform/lang-impl/src/com/intellij/util/SequentialModalProgressTask.java
platform/lang-impl/src/com/intellij/util/indexing/DeletedVirtualFileStub.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java
platform/lang-impl/src/com/intellij/util/indexing/IndexAccessValidator.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/util/indexing/IndexingStamp.java
platform/lang-impl/src/com/intellij/util/indexing/MapIndexStorage.java
platform/lang-impl/src/com/intellij/util/indexing/ProjectFilesCondition.java
platform/lang-impl/src/com/intellij/webcore/packaging/ManagePackagesDialog.java
platform/platform-api/src/com/intellij/execution/process/CapturingAnsiEscapesAwareProcessHandler.java
platform/platform-api/src/com/intellij/execution/process/CapturingProcessHandler.java
platform/platform-api/src/com/intellij/execution/process/ColoredProcessHandler.java
platform/platform-api/src/com/intellij/execution/process/OSProcessHandler.java
platform/platform-api/src/com/intellij/execution/util/ExecUtil.java
platform/platform-api/src/com/intellij/openapi/ui/JBPopupMenu.java
platform/platform-api/src/com/intellij/openapi/wm/IdeGlassPaneUtil.java
platform/platform-api/src/com/intellij/ui/CollectionListModel.java
platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java
platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java
platform/platform-impl/platform-impl.iml
platform/platform-impl/src/com/intellij/diagnostic/DebugLogManager.java
platform/platform-impl/src/com/intellij/diagnostic/IdeMessagePanel.java
platform/platform-impl/src/com/intellij/execution/ExecutableValidator.java
platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java
platform/platform-impl/src/com/intellij/execution/process/ScriptRunnerUtil.java
platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
platform/platform-impl/src/com/intellij/ide/SaveAndSyncHandlerImpl.java
platform/platform-impl/src/com/intellij/ide/actions/AboutPopup.java
platform/platform-impl/src/com/intellij/ide/actions/DebugLogConfigureAction.java
platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java
platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionPreloader.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java
platform/platform-impl/src/com/intellij/idea/IdeaLogger.java
platform/platform-impl/src/com/intellij/idea/RareLogger.java
platform/platform-impl/src/com/intellij/idea/StartupUtil.java
platform/platform-impl/src/com/intellij/internal/statistic/StatisticsUtil.kt [new file with mode: 0644]
platform/platform-impl/src/com/intellij/internal/statistic/beans/UsageDescriptor.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionPreloader.java
platform/platform-impl/src/com/intellij/openapi/application/Preloader.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/openapi/application/PreloadingActivity.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/openapi/command/impl/EditorChangeAction.java
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedoStacksHolder.java
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoableGroup.java
platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.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/SoftWrapModelImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/CompositeSoftWrapPainter.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorPainter.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/FontLayoutService.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/LogicalPositionCache.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/VisualLinesIterator.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorState.java
platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java
platform/platform-impl/src/com/intellij/openapi/project/FileContentQueue.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/BuildInfo.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/ButtonInfo.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PatchInfo.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/Product.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChannel.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateCheckerComponent.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfo.kt [new file with mode: 0644]
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesInfo.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form
platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/NativeFileWatcherImpl.java
platform/platform-impl/src/com/intellij/remote/BaseRemoteProcessHandler.java
platform/platform-impl/src/com/intellij/remote/ColoredRemoteProcessHandler.java
platform/platform-impl/src/com/intellij/ui/AppIcon.java
platform/platform-impl/src/com/intellij/util/MessageBusUtil.java
platform/platform-impl/src/com/intellij/util/ui/table/JBListTable.java
platform/platform-impl/src/org/jetbrains/concurrency/promise.kt
platform/platform-impl/src/org/jetbrains/io/ChannelRegistrar.java
platform/platform-impl/src/org/jetbrains/io/NettyUtil.java
platform/platform-resources-en/src/messages/IdeBundle.properties
platform/platform-resources-en/src/messages/InspectionsBundle.properties
platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
platform/platform-resources/src/META-INF/PlatformExtensions.xml
platform/platform-resources/src/brokenPlugins.txt
platform/platform-resources/src/componentSets/Platform.xml
platform/platform-resources/src/componentSets/PlatformComponents.xml
platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java
platform/platform-tests/testSrc/com/intellij/execution/impl/ConsoleViewImplTest.java
platform/platform-tests/testSrc/com/intellij/ide/updates/UpdateStrategyTest.java
platform/platform-tests/testSrc/com/intellij/ide/updates/UpdatesInfoParserTest.java
platform/platform-tests/testSrc/com/intellij/ide/updates/current.xml
platform/platform-tests/testSrc/com/intellij/ide/updates/idea-123280.xml [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/internal/statistics/StatisticsUtilTest.kt [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorPaintingPerformanceTest.java [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/openapi/editor/NullGraphics2D.java [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/AbstractEditorTest.java
platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/HeavyFileEditorManagerTestCase.java
platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java
platform/platform-tests/testSrc/com/intellij/util/messages/MessageBusTest.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java
platform/script-debugger/backend/src/org/jetbrains/debugger/CallFrame.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/CallFrame.kt [new file with mode: 0755]
platform/script-debugger/backend/src/org/jetbrains/debugger/CallFrameBase.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/CallFrameBase.kt [new file with mode: 0644]
platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventAdapter.java
platform/script-debugger/backend/src/org/jetbrains/debugger/DebugEventListener.java
platform/script-debugger/backend/src/org/jetbrains/debugger/DeclarativeScope.kt
platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContext.kt
platform/script-debugger/backend/src/org/jetbrains/debugger/EvaluateContextBase.kt
platform/script-debugger/backend/src/org/jetbrains/debugger/StepAction.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContext.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContext.kt [new file with mode: 0755]
platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextBase.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextBase.kt [new file with mode: 0644]
platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManager.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManager.kt [new file with mode: 0644]
platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManagerBase.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManagerBase.kt [new file with mode: 0644]
platform/script-debugger/backend/src/org/jetbrains/debugger/VariablesHost.java
platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMap.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMap.kt [new file with mode: 0644]
platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.kt [new file with mode: 0644]
platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceResolver.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceResolver.kt [new file with mode: 0644]
platform/script-debugger/backend/src/org/jetbrains/debugger/values/ObjectValue.kt
platform/script-debugger/backend/src/org/jetbrains/debugger/values/ObjectValueBase.kt
platform/script-debugger/backend/src/org/jetbrains/debugger/values/ValueManager.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/values/ValueManager.kt [new file with mode: 0644]
platform/script-debugger/backend/src/org/jetbrains/rpc/CommandProcessor.kt
platform/script-debugger/backend/src/org/jetbrains/rpc/CommandSenderBase.kt
platform/script-debugger/backend/src/org/jetbrains/rpc/MessageManager.kt
platform/script-debugger/backend/src/org/jetbrains/rpc/MessageProcessor.kt [deleted file]
platform/script-debugger/backend/src/org/jetbrains/rpc/RequestCallback.kt [deleted file]
platform/script-debugger/backend/src/org/jetbrains/rpc/ResultReader.kt [deleted file]
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebugProcessImpl.kt
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/LineBreakpointManager.kt
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/ValueNodeAsyncFunction.kt [deleted file]
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/VariableView.kt
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/connection/RemoteVmConnection.kt
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/CallFrameView.kt
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/ExecutionStackImpl.kt
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/SuspendContextImpl.kt
platform/script-debugger/debugger-ui/src/util.kt
platform/script-debugger/protocol/protocol-model-generator/generated/ProtocolSchemaReaderImpl.kt [new file with mode: 0644]
platform/script-debugger/protocol/protocol-model-generator/generated/org/jetbrains/jsonProtocol/ProtocolSchemaReaderImpl.java [deleted file]
platform/script-debugger/protocol/protocol-model-generator/src/ClassScope.kt
platform/script-debugger/protocol/protocol-model-generator/src/DomainGenerator.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/MemberScope.kt
platform/script-debugger/protocol/protocol-model-generator/src/OutputClassScope.kt
platform/script-debugger/protocol/protocol-model-generator/src/TypeDescriptor.kt
platform/script-debugger/protocol/protocol-reader-runtime/src/annotations.kt [new file with mode: 0644]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/EventMap.kt [new file with mode: 0644]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonField.java [deleted file]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonOptionalField.java [deleted file]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonParseMethod.java [deleted file]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonSubtypeCasting.java [deleted file]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonType.java [deleted file]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonWriters.java [deleted file]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonWriters.kt [new file with mode: 0644]
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/Request.kt
platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/ResponseResultReader.java [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/ReadDelegate.kt [deleted file]
platform/script-debugger/protocol/protocol-reader/src/ReaderGenerator.kt
platform/script-debugger/protocol/protocol-reader/src/ReaderRoot.kt
platform/script-debugger/protocol/protocol-reader/src/TextOutput.kt
platform/script-debugger/protocol/protocol-reader/src/TypeWriter.kt
platform/script-debugger/protocol/schema-reader-generator/src/ProtocolMetaModel.kt
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java
platform/testFramework/src/com/intellij/testFramework/FileEditorManagerTestCase.java
platform/testFramework/src/com/intellij/testFramework/ParsingTestCase.java
platform/testFramework/src/com/intellij/testFramework/TestLogger.java
platform/testFramework/src/com/intellij/testFramework/ThreadTracker.java
platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java
platform/util/resources/misc/registry.properties
platform/util/src/com/intellij/execution/CommandLineUtil.java
platform/util/src/com/intellij/execution/process/BaseOSProcessHandler.java
platform/util/src/com/intellij/openapi/application/PathManager.java
platform/util/src/com/intellij/openapi/diagnostic/Log4jBasedLogger.java [new file with mode: 0644]
platform/util/src/com/intellij/openapi/diagnostic/Logger.java
platform/util/src/com/intellij/openapi/util/TraceableDisposable.java
platform/util/src/com/intellij/openapi/util/io/win32/IdeaWin32.java
platform/util/src/com/intellij/openapi/util/objectTree/ThrowableInterner.java
platform/util/src/com/intellij/util/ConcurrencyUtil.java
platform/util/src/com/intellij/util/containers/ContainerUtil.java
platform/util/src/com/intellij/util/containers/WeakInterner.java
platform/util/src/com/intellij/util/io/BaseDataReader.java
platform/util/src/com/intellij/util/io/OutputReader.java
platform/util/src/com/intellij/util/io/PagedFileStorage.java
platform/util/src/com/intellij/util/io/RandomAccessFileWithLengthAndSizeTracking.java
platform/util/src/com/intellij/util/text/StringTokenizer.java
platform/util/testSrc/com/intellij/util/io/BaseOutputReaderTest.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/IgnoredFilesComponent.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java
platform/vcs-impl/src/com/intellij/vcs/AnnotationProviderEx.java
platform/vcs-impl/src/com/intellij/vcs/VcsShowToolWindowTabAction.java
platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java
platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/TestClientRunner.java
platform/vcs-log/graph/test/com/intellij/vcs/log/graph/TestGraphBuilderTest.kt
platform/vcs-log/graph/test/com/intellij/vcs/log/graph/utils/IntIntMultiMapTest.kt
platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogRepoSizeCollector.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/bugs/EmptyStatementBodyInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MismatchedCollectionQueryUpdateInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SubtractionInCompareToInspectionBase.java [moved from plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SubtractionInCompareToInspection.java with 50% similarity]
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestMethodWithoutAssertionInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodMatcher.java [new file with mode: 0644]
plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/bugs/SubtractionInCompareToInspection.java [new file with mode: 0644]
plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestMethodWithoutAssertionInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/performance/CollectionsListSettings.java [new file with mode: 0644]
plugins/InspectionGadgets/src/com/siyeh/ig/performance/CollectionsMustHaveInitialCapacityInspection.java [moved from plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/CollectionsMustHaveInitialCapacityInspection.java with 64% similarity]
plugins/InspectionGadgets/src/inspectionDescriptions/CollectionsMustHaveInitialCapacity.html
plugins/InspectionGadgets/src/inspectionDescriptions/IgnoreResultOfCall.html
plugins/InspectionGadgets/src/inspectionDescriptions/SubtractionInCompareTo.html
plugins/InspectionGadgets/src/inspectionDescriptions/TestMethodWithoutAssertion.html
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/empty_statement_body/EmptyStatementBody.java
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/mismatched_collection_query_update/MismatchedCollectionQueryUpdate.java
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/subtraction_in_compare_to/SubtractionInCompareTo.java
plugins/InspectionGadgets/test/com/siyeh/igtest/dataflow/constant_value_variable_use/ConstantValueVariableUse.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionTest.groovy
plugins/IntelliLang/IntelliLang-tests/IntelliLang-tests.iml
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotationUtilEx.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceMethodRefWithLambdaIntention.java
plugins/git4idea/src/META-INF/plugin.xml
plugins/git4idea/src/git4idea/GitStatisticsCollector.kt [new file with mode: 0644]
plugins/git4idea/src/git4idea/actions/GitShowCommitInLogAnnotationGutterActionProvider.java
plugins/git4idea/src/git4idea/commands/GitHandler.java
plugins/git4idea/src/git4idea/commands/GitTextHandler.java
plugins/git4idea/src/git4idea/config/GitExecutableDetector.java
plugins/git4idea/src/git4idea/config/GitVersion.java
plugins/git4idea/src/git4idea/log/GitShowCommitInLogAction.java
plugins/git4idea/src/git4idea/push/GitPushNativeResult.java
plugins/git4idea/src/git4idea/push/GitPushNativeResultParser.java
plugins/git4idea/src/git4idea/push/GitPushOperation.java
plugins/git4idea/src/git4idea/push/GitPushRepoResult.java
plugins/git4idea/src/git4idea/push/GitPushResultNotification.java
plugins/git4idea/src/git4idea/push/GroupedPushResult.java
plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java
plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitXmlRpcHandlerService.java
plugins/git4idea/tests/git4idea/push/GitPushNativeResultParserTest.java [deleted file]
plugins/git4idea/tests/git4idea/push/GitPushNativeResultParserTest.kt [new file with mode: 0644]
plugins/git4idea/tests/git4idea/push/GitPushOperationBaseTest.java [deleted file]
plugins/git4idea/tests/git4idea/push/GitPushOperationBaseTest.kt [new file with mode: 0644]
plugins/git4idea/tests/git4idea/push/GitPushOperationMultiRepoTest.java [deleted file]
plugins/git4idea/tests/git4idea/push/GitPushOperationMultiRepoTest.kt [new file with mode: 0644]
plugins/git4idea/tests/git4idea/push/GitPushOperationSingleRepoTest.java [deleted file]
plugins/git4idea/tests/git4idea/push/GitPushOperationSingleRepoTest.kt [new file with mode: 0644]
plugins/git4idea/tests/git4idea/push/GitPushResultNotificationTest.java
plugins/git4idea/tests/git4idea/rebase/GitMultiRepoRebaseTest.kt
plugins/git4idea/tests/git4idea/rebase/GitRebaseBaseTest.kt
plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt
plugins/git4idea/tests/git4idea/test/GitPlatformTest.java [deleted file]
plugins/git4idea/tests/git4idea/test/GitPlatformTest.kt [new file with mode: 0644]
plugins/git4idea/tests/git4idea/test/RepoBuilder.kt
plugins/git4idea/tests/git4idea/test/TestDialogManager.kt
plugins/git4idea/tests/git4idea/test/TestGit.kt
plugins/git4idea/tests/git4idea/tests/GitCommitTest.java
plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/EnhancerProcessHandlerBase.java
plugins/google-app-engine/source/com/intellij/appengine/actions/AppEngineUploader.java
plugins/google-app-engine/source/com/intellij/appengine/enhancement/EnhancerProcessHandler.java
plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/javaee/JavaEEGradleProjectResolverExtension.java
plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/Ear.java [new file with mode: 0644]
plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/EarConfigurationModelData.java [new file with mode: 0644]
plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/EarResource.java [new file with mode: 0644]
plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/Jar.java [new file with mode: 0644]
plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/War.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java
plugins/gradle/testSources/org/jetbrains/plugins/gradle/GradleProjectWizardTest.java
plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ExternalProjectDependency.java
plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ear/EarConfiguration.java [new file with mode: 0644]
plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.5.jar [new file with mode: 0644]
plugins/gradle/tooling-extension-impl/src/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalProjectDependency.java
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/CopySpecWalker.groovy [new file with mode: 0644]
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/EarModelBuilderImpl.groovy [new file with mode: 0644]
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/WarModelBuilderImpl.groovy
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/ear/EarConfigurationImpl.java [new file with mode: 0644]
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/ear/EarModelImpl.java [new file with mode: 0644]
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/ear/EarResourceImpl.java [new file with mode: 0644]
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy
plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ast/builder/BuilderAnnotationContributor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ast/builder/strategy/DefaultBuilderStrategySupport.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ast/builder/strategy/ExternalBuilderStrategySupport.java
plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/ForkedGroovyc.java
plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsole.java
plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcConsole.java
plugins/groovy/src/org/jetbrains/plugins/groovy/shell/GroovyShellRunnerImpl.java
plugins/groovy/test/org/jetbrains/plugins/groovy/completion/builder/GrExternalBuilderStrategyWithJavaClassTest.groovy [new file with mode: 0644]
plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandProcessHandler.java
plugins/java-decompiler/plugin/java-decompiler-plugin.iml
plugins/java-decompiler/plugin/src/messages/Decompiler.properties
plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.kt
plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/LegalNoticeDialog.java
plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenEffectivePomDumper.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java
plugins/settings-repository/src/IcsManager.kt
plugins/settings-repository/src/copyAppSettingsToRepository.kt
plugins/settings-repository/src/git/GitRepositoryManager.kt
plugins/settings-repository/src/git/JGitMergeProvider.kt
plugins/settings-repository/src/sync.kt
plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnProcessHandler.java
plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TerminalExecutor.java
plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TerminalProcessHandler.java
plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/WinTerminalExecutor.java
plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/WinTerminalProcessHandler.java
plugins/tasks/tasks-core/src/com/intellij/tasks/context/OpenEditorsContextProvider.java
plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGTreeHierarchyTest.java
plugins/testng_rt/src/org/testng/IDEATestNGRemoteListener.java
python/edu/resources/idea/PyCharmEduApplicationInfo.xml
python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyRunAction.java
python/educational/interactive-learning/src/com/jetbrains/edu/learning/run/StudySmartChecker.java
python/helpers/.idea/helpers.iml
python/helpers/packaging_tool.py
python/helpers/pycharm_generator_utils/constants.py
python/helpers/pydev/pydev_monkey.py
python/helpers/pydev/pydevd.py
python/helpers/pydev/pydevd_concurrency_analyser/pydevd_thread_wrappers.py
python/helpers/pydev/pydevd_frame.py
python/helpers/pydev/pydevd_signature.py
python/helpers/rest_formatter.py
python/helpers/sphinxcontrib/napoleon/docstring.py
python/ide/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
python/openapi/src/com/jetbrains/python/packaging/PyPackageManagers.java
python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
python/python-helpers.iml
python/resources/idea/PyCharmCoreApplicationInfo.xml
python/src/com/jetbrains/pyqt/CompileQrcAction.java
python/src/com/jetbrains/python/console/PyConsoleProcessHandler.java
python/src/com/jetbrains/python/console/PydevConsoleRunner.java
python/src/com/jetbrains/python/debugger/PyConcurrencyService.java
python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.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/psi/PyUtil.java
python/src/com/jetbrains/python/remote/PyRemoteProcessHandlerBase.java
python/src/com/jetbrains/python/run/PythonCommandLineState.java
python/src/com/jetbrains/python/run/PythonProcessHandler.java
python/src/com/jetbrains/python/sdk/PySdkUpdater.java
python/src/com/jetbrains/python/sdk/PySdkUtil.java
python/src/com/jetbrains/python/sdk/PythonSdkType.java
python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
python/src/com/jetbrains/python/testing/PythonUnitTestUtil.java
python/src/com/jetbrains/python/testing/VFSTestFrameworkListener.java
python/testData/skeletons/BinaryStandardModule.py
python/testSrc/com/jetbrains/python/testing/JythonUnitTestUtil.java
resources-en/src/inspectionDescriptions/CollectionAddAllCanBeReplacedWithConstructor.html
resources-en/src/messages/QuickFixBundle.properties
resources/src/META-INF/IdeaPlugin.xml
spellchecker/src/com/intellij/spellchecker/english.dic
updater/src/com/intellij/updater/Runner.java
xml/dom-tests/tests/com/intellij/util/xml/DomHighlightingLiteTest.java
xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/ConvertSchemaPrefixToDefaultIntention.java
xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagNameSynchronizer.java
xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java
xml/tests/src/com/intellij/codeInsight/completion/XmlSyncTagCommunityTest.java
xml/tests/src/com/intellij/editor/XmlEditorTest.java
xml/xml-psi-impl/src/com/intellij/html/impl/util/MicrodataUtil.java

diff --git a/.idea/libraries/bouncy_castle.xml b/.idea/libraries/bouncy_castle.xml
deleted file mode 100644 (file)
index 4e4673a..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="bouncy-castle">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/bcpkix-jdk15on-1.48.jar!/" />
-      <root url="jar://$PROJECT_DIR$/android/android/lib/bcprov-jdk15on-1.48.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
index 44969bd6dc242da00ecf5d291aefec14a84ce72d..fdfe1be268a621393488c731602a5fbc53eb52f7 100644 (file)
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="builder-model">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/builder-model-1.3.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/builder-model-1.4.0-beta2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/src/builder-model-1.3.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/src/builder-model-1.4.0-beta2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/commons_compress.xml b/.idea/libraries/commons_compress.xml
deleted file mode 100644 (file)
index a77ee36..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-compress">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/commons-compress-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
index 493a73de1a073187c7d9ccf911c7169e821837f5..62128a51774c5d3635acb7c48461d7ad9ad1b1e7 100644 (file)
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.4.1-src.zip!/httpcomponents-core-4.4.1/httpcore/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.4.1-src.zip!/httpcomponents-core-4.4.1/httpcore/src/main/java-deprecated" />
       <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.4.1-src.zip!/httpcomponents-client-4.4.1/httpmime/src/main/java" />
       <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.4.1-src.zip!/httpcomponents-client-4.4.1/httpmime/src/main/java-deprecated" />
       <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.4.1-src.zip!/httpcomponents-client-4.4.1/fluent-hc/src/main/java" />
       <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.4.1-src.zip!/httpcomponents-client-4.4.1/httpclient/src/main/java" />
       <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.4.1-src.zip!/httpcomponents-client-4.4.1/httpclient/src/main/java-deprecated" />
-      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.4.1 -src.zip!/httpcomponents-core-4.3.3/httpcore/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.4.1-src.zip!/httpcomponents-core-4.3.3/httpcore/src/main/java-deprecated" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/javawriter.xml b/.idea/libraries/javawriter.xml
deleted file mode 100644 (file)
index 1d73b23..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="javawriter">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/javawriter-2.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/android/android/lib/src/javawriter-2.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/junit_hamcrest.xml b/.idea/libraries/junit_hamcrest.xml
deleted file mode 100644 (file)
index dd6eb1c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<component name="libraryTable">
-  <library name="junit-hamcrest">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-junit-2.0.0.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/java-hamcrest-2.0.0.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/junit-4.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-junit-2.0.0.0-javadoc.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/java-hamcrest-2.0.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-junit-2.0.0.0-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/java-hamcrest-2.0.0.0-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/src/junit-4.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
index bd14749a55e5476cee72c0c35bf405d1ce129f32..77fc541298b19e2e84efa87eee06b54918086063 100644 (file)
       <module fileurl="file://$PROJECT_DIR$/java/manifest/manifest.iml" filepath="$PROJECT_DIR$/java/manifest/manifest.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/manifest-merger/manifest-merger.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/manifest-merger/manifest-merger.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven.iml" filepath="$PROJECT_DIR$/plugins/maven/maven.iml" group="plugins/maven" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver/common/maven-artifact-resolver-common.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m31/maven-artifact-resolver-m31.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m31/maven-artifact-resolver-m31.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/python/python-community.iml" filepath="$PROJECT_DIR$/python/python-community.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/build/python-community-build.iml" filepath="$PROJECT_DIR$/python/build/python-community-build.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/pluginSrc/python-community-plugin.iml" filepath="$PROJECT_DIR$/python/pluginSrc/python-community-plugin.iml" group="python" />
+      <module fileurl="file://$PROJECT_DIR$/python/python-community-plugin-resources.iml" filepath="$PROJECT_DIR$/python/python-community-plugin-resources.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/testSrc/python-community-tests.iml" filepath="$PROJECT_DIR$/python/testSrc/python-community-tests.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/edu/build/python-edu-build.iml" filepath="$PROJECT_DIR$/python/edu/build/python-edu-build.iml" group="python/educational" />
       <module fileurl="file://$PROJECT_DIR$/python/edu/python-educational.iml" filepath="$PROJECT_DIR$/python/edu/python-educational.iml" group="python/educational" />
index 4a2fea25f1f8d0f0809eecd6f75bbd43f6b7fb3f..9d08eb89f5fa2905589f5dd7645ed8c014ff80f0 100644 (file)
@@ -162,7 +162,7 @@ libraryLicense(name: "ANTLR 4 Runtime", libraryName: "antlr-runtime-4.1.jar", ve
 libraryLicense(name: "Antlr", libraryName: "antlr.jar", version: "3.4", license: "BSD", url: "http://www.antlr.org", licenseUrl: "http://www.antlr.org/license.html")
 libraryLicense(name: "Apache Commons BeanUtils", libraryName: "commons-beanutils.jar", version: "1.6", license: "Apache 2.0", url: "http://commons.apache.org/beanutils/")
 libraryLicense(name: "Apache Commons Codec", libraryName: "commons-codec", version: "1.8", license: "Apache 2.0", url: "http://commons.apache.org/codec/", licenseUrl: "http://commons.apache.org/license.html")
-libraryLicense(name: "Apache Commons Compress", libraryName: "commons-compress", version: "1.0", license: "Apache 2.0", url: "http://commons.apache.org/proper/commons-compress/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
+libraryLicense(name: "Apache Commons Compress", libraryName: "commons-compress-android", version: "1.0", license: "Apache 2.0", url: "http://commons.apache.org/proper/commons-compress/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "Apache Commons Discovery", libraryName: "commons-discovery-0.4.jar", version: "0.4", license: "Apache 2.0", url: "http://jakarta.apache.org/commons/discovery/", licenseUrl: "http://commons.apache.org/license.html")
 libraryLicense(name: "Apache Commons HTTPClient", libraryName: "http-client-3.1", version: "3.1&nbsp; (with patch by JetBrains)", license: "Apache 2.0", url: "http://hc.apache.org/httpclient-3.x")
 libraryLicense(name: "Apache Commons IO", libraryName: "commons-io-1.4.jar", version: "1.4", license: "Apache 2.0", url: "http://commons.apache.org/io/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt")
index 3eba0f04df057b37335213de706907e56f76078a..3398342ac17f4fee0965f54f3dfce3a5828bcaae 100644 (file)
@@ -71,7 +71,6 @@ 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() })
@@ -338,6 +337,7 @@ binding.setVariable("commonJvmArgsForTests", {
     "-ea",
     "-Dfile.encoding=UTF-8",
     "-Dio.netty.leakDetectionLevel=PARANOID",
+//    yjpOptions("junit", "64"), // uncomment to start tests with a profiling agent (e.g. in a personal build)
     "-server",
     "-Xbootclasspath/p:${projectBuilder.moduleOutput(findModule("boot"))}",
     "-XX:+HeapDumpOnOutOfMemoryError",
@@ -346,6 +346,8 @@ binding.setVariable("commonJvmArgsForTests", {
     "-Didea.system.path=${p("teamcity.build.tempDir")}/system",
     "-Xdebug",
     "-XX:ReservedCodeCacheSize=240m",
+    "-XX:SoftRefLRUPolicyMSPerMB=50",
+    "-XX:+UseConcMarkSweepGC",
     "-XX:-OmitStackTraceInFastThrow",
     jdwp
   ]
index 444eecf7411fe1fadfc8b515ceb5423584b153dc..27c97bff5f93fbb314376e353d206227f9cd727e 100644 (file)
       </value>
     </option>
     <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
+    <option name="PHP_PARAMETER" baseAttributes="DEFAULT_PARAMETER" />
     <option name="PROPERTIES.LINE_COMMENT">
       <value>
         <option name="FOREGROUND" value="e75252" />
index d424ec5a679af7af7ec0d7e5c8b77dcfeeb68066..3344e5ef301b05699790e2b8e6a04d00f12373ab 100644 (file)
@@ -1,34 +1,19 @@
-<scheme name="AllHallowsEve" version="142" parent_scheme="Default">
+<scheme name="All hallow's eve" parent_scheme="Default" version="1">
   <option name="LINE_SPACING" value="1.0" />
   <option name="EDITOR_FONT_SIZE" value="12" />
-  <option name="EDITOR_FONT_NAME" value="Monaco" />
+  <option name="EDITOR_FONT_NAME" value="Menlo" />
   <colors>
-    <option name="CARET_COLOR" value="ffffff" />
-    <option name="CARET_ROW_COLOR" value="333300" />
-    <option name="CONSOLE_BACKGROUND_KEY" value="0" />
-    <option name="GUTTER_BACKGROUND" value="0" />
+    <option name="CONSOLE_BACKGROUND_KEY" value="000000" />
     <option name="INDENT_GUIDE" value="404040" />
-    <option name="LINE_NUMBERS_COLOR" value="ffffff" />
-    <option name="SELECTED_INDENT_GUIDE" value="404040" />
     <option name="SELECTION_BACKGROUND" value="644d6e" />
+    <option name="CARET_ROW_COLOR" value="333300" />
     <option name="WHITESPACES" value="404040" />
+    <option name="CARET_COLOR" value="FFFFFF" />
+    <option name="LINE_NUMBERS_COLOR" value="FFFFFF" />
+    <option name="SELECTED_INDENT_GUIDE" value="404040" />
+    <option name="GUTTER_BACKGROUND" value="000000" />
   </colors>
   <attributes>
-    <option name="APACHE_CONFIG.ARG_LEXEM">
-      <value>
-        <option name="FOREGROUND" value="66cc33" />
-      </value>
-    </option>
-    <option name="APACHE_CONFIG.COMMENT">
-      <value>
-        <option name="FOREGROUND" value="9933cc" />
-      </value>
-    </option>
-    <option name="APACHE_CONFIG.IDENTIFIER">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
     <option name="BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="CLASS_NAME_ATTRIBUTES" />
+    <option baseAttributes="TYPEDEF" name="CLASS_REFERENCE" />
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.CLASS_NAME">
-      <value />
-    </option>
+    <option baseAttributes="DEFAULT_BRACES" name="COFFEESCRIPT.BRACE" />
+    <option baseAttributes="DEFAULT_BRACKETS" name="COFFEESCRIPT.BRACKET" />
+    <option baseAttributes="TEXT" name="COFFEESCRIPT.CLASS_NAME" />
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.COMMA">
-      <value />
-    </option>
+    <option baseAttributes="DEFAULT_COMMA" name="COFFEESCRIPT.COMMA" />
+    <option baseAttributes="DEFAULT_DOT" name="COFFEESCRIPT.DOT" />
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK" />
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.FUNCTION_NAME">
-      <value />
-    </option>
+    <option baseAttributes="TEXT" name="COFFEESCRIPT.FUNCTION_NAME" />
     <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="cccc33" />
+        <option name="FOREGROUND" value="CCCC33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="cccc33" />
+        <option name="FOREGROUND" value="CCCC33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.JAVASCRIPT_CONTENT">
-      <value />
-    </option>
+    <option baseAttributes="DEFAULT_STRING" name="COFFEESCRIPT.JAVASCRIPT_CONTENT" />
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.OBJECT_KEY">
-      <value />
-    </option>
+    <option baseAttributes="TEXT" name="COFFEESCRIPT.OBJECT_KEY" />
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="COFFEESCRIPT.PARAMETER">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_PARENTHS" name="COFFEESCRIPT.PARENTHESIS" />
+    <option baseAttributes="TEXT" name="COFFEESCRIPT.PROTOTYPE" />
+    <option baseAttributes="DEFAULT_DOT" name="COFFEESCRIPT.RANGE" />
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="cccc33" />
+        <option name="FOREGROUND" value="CCCC33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="cccc33" />
+        <option name="FOREGROUND" value="CCCC33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="cccc33" />
+        <option name="FOREGROUND" value="CCCC33" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.SEMICOLON">
-      <value />
-    </option>
+    <option baseAttributes="DEFAULT_SEMICOLON" name="COFFEESCRIPT.SEMICOLON" />
+    <option baseAttributes="DEFAULT_DOT" name="COFFEESCRIPT.SPLAT" />
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
+      </value>
+    </option>
+    <option name="CONDITIONALLY_NOT_COMPILED">
+      <value>
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="6b8b8" />
+        <option name="FOREGROUND" value="06b8b8" />
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
         <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
-    <option name="CONSOLE_RANGE_TO_EXECUTE">
-      <value />
-    </option>
     <option name="CONSOLE_RED_OUTPUT">
       <value>
         <option name="FOREGROUND" value="ff6767" />
         <option name="FOREGROUND" value="754200" />
       </value>
     </option>
-    <option name="CSS.COLOR">
+    <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="c83730" />
-      </value>
-    </option>
-    <option name="CSS.IDENT">
-      <value />
-    </option>
-    <option name="CSS.KEYWORD">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-        <option name="EFFECT_TYPE" value="1" />
+        <option name="FOREGROUND" value="C83730" />
       </value>
     </option>
+    <option baseAttributes="HTML_TAG_NAME" name="CSS.IDENT" />
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
-      <value />
+      <value>
+        <option name="FONT_TYPE" value="1" />
+      </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
       <value>
         <option name="FOREGROUND" value="68e868" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="CSS.STRING">
+    <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
     <option name="CSS.URL">
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="DEFAULT_INVALID_STRING_ESCAPE" />
+    <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="68e868" />
+        <option name="BACKGROUND" value="481515" />
+      </value>
+    </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="e3e3ff" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_LINE_COMMENT" />
-    <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_BLOCK_COMMENT" />
-    <option name="CUSTOM_NUMBER_ATTRIBUTES" baseAttributes="DEFAULT_NUMBER" />
-    <option name="CUSTOM_STRING_ATTRIBUTES" baseAttributes="DEFAULT_STRING" />
-    <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="DEFAULT_VALID_STRING_ESCAPE" />
-    <option name="Clojure Atom">
+    <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="9933CC" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="Clojure Character">
+    <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="9933CC" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="Clojure Line comment">
+    <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
-    <option name="Clojure Literal">
+    <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="fda5ff" />
+        <option name="FOREGROUND" value="66CC33" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
+    <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="3387CC" />
+        <option name="FONT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="Clojure Atom">
+      <value>
+        <option name="FOREGROUND" value="CC7833" />
+      </value>
+    </option>
+    <option name="Clojure Character">
+      <value>
+        <option name="FOREGROUND" value="66CC33" />
+      </value>
+    </option>
+    <option baseAttributes="RUBY_IDENTIFIER" name="Clojure Keyword" />
+    <option name="Clojure Line comment">
+      <value>
+        <option name="FOREGROUND" value="9933CC" />
+      </value>
+    </option>
+    <option baseAttributes="DEFAULT_INSTANCE_FIELD" name="Clojure Literal" />
     <option name="Clojure Numbers">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="Clojure Strings">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
-    <option name="DEFAULT_ATTRIBUTE">
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_ATTRIBUTE" />
+    <option name="DEFAULT_BLOCK_COMMENT">
       <value>
-        <option name="EFFECT_COLOR" value="ffffff" />
-        <option name="EFFECT_TYPE" value="1" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
-    <option name="DEFAULT_BLOCK_COMMENT">
+    <option baseAttributes="TEXT" name="DEFAULT_BRACES" />
+    <option baseAttributes="TEXT" name="DEFAULT_BRACKETS" />
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_CLASS_NAME" />
+    <option baseAttributes="TEXT" name="DEFAULT_COMMA" />
+    <option name="DEFAULT_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
-    <option name="DEFAULT_CONSTANT" baseAttributes="DEFAULT_IDENTIFIER" />
     <option name="DEFAULT_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
-    <option name="DEFAULT_DOC_COMMENT_TAG_VALUE">
+    <option name="DEFAULT_DOC_COMMENT_TAG">
       <value>
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="DEFAULT_DOC_MARKUP">
-      <value />
-    </option>
-    <option name="DEFAULT_ENTITY">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
-    <option name="DEFAULT_IDENTIFIER">
-      <value />
-    </option>
-    <option name="DEFAULT_INSTANCE_FIELD" baseAttributes="DEFAULT_IDENTIFIER" />
-    <option name="DEFAULT_INVALID_STRING_ESCAPE">
+    <option baseAttributes="TEXT" name="DEFAULT_DOT" />
+    <option name="DEFAULT_ENTITY">
       <value>
-        <option name="BACKGROUND" value="6e3b3b" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
-    <option name="DEFAULT_KEYWORD">
+    <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="DEFAULT_FUNCTION_CALL" />
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_FUNCTION_DECLARATION" />
+    <option name="DEFAULT_GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
-        <option name="EFFECT_TYPE" value="1" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="DEFAULT_LABEL">
+    <option baseAttributes="TEXT" name="DEFAULT_IDENTIFIER" />
+    <option baseAttributes="DEFAULT_LOCAL_VARIABLE" name="DEFAULT_INSTANCE_FIELD" />
+    <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="DEFAULT_INSTANCE_METHOD" />
+    <option baseAttributes="DEFAULT_CLASS_NAME" name="DEFAULT_INTERFACE_NAME" />
+    <option baseAttributes="TEXT" name="DEFAULT_INVALID_STRING_ESCAPE" />
+    <option name="DEFAULT_KEYWORD">
       <value>
-        <option name="EFFECT_COLOR" value="808080" />
-        <option name="EFFECT_TYPE" value="1" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_LABEL" />
     <option name="DEFAULT_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_LOCAL_VARIABLE" />
+    <option baseAttributes="TEXT" name="DEFAULT_METADATA" />
     <option name="DEFAULT_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="DEFAULT_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
-    <option name="DEFAULT_STATIC_FIELD" baseAttributes="DEFAULT_IDENTIFIER" />
-    <option name="DEFAULT_STRING">
+    <option name="DEFAULT_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="DEFAULT_TAG">
-      <value />
+    <option baseAttributes="TEXT" name="DEFAULT_PARENTHS" />
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_PREDEFINED_SYMBOL" />
+    <option baseAttributes="TEXT" name="DEFAULT_SEMICOLON" />
+    <option name="DEFAULT_STATIC_FIELD">
+      <value>
+        <option name="FONT_TYPE" value="2" />
+      </value>
     </option>
+    <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="DEFAULT_STATIC_METHOD" />
+    <option name="DEFAULT_STRING">
+      <value>
+        <option name="FOREGROUND" value="66CC33" />
+      </value>
+    </option>
+    <option baseAttributes="TEXT" name="DEFAULT_TAG" />
     <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="BACKGROUND" value="434242" />
+      </value>
     </option>
     <option name="DEFAULT_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="aaaaaa" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_COLOR" value="c0c0c0" />
         <option name="EFFECT_TYPE" value="3" />
+        <option name="EFFECT_COLOR" value="c0c0c0" />
       </value>
     </option>
     <option name="DIFF_CONFLICT">
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="c83730" />
+        <option name="FOREGROUND" value="C83730" />
       </value>
     </option>
+    <option baseAttributes="XML_ATTRIBUTE_NAME" name="DJANGO_ID" />
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_BRACES" name="DJANGO_TAG_START_END" />
     <option name="DUPLICATE_FROM_SERVER">
       <value>
         <option name="BACKGROUND" value="30322b" />
       </value>
     </option>
+    <option name="ENUM_CONST">
+      <value>
+        <option name="FOREGROUND" value="3387CC" />
+      </value>
+    </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="cf5b56" />
         <option name="EFFECT_TYPE" value="2" />
+        <option name="EFFECT_COLOR" value="ff6767" />
+        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="101" />
+        <option name="FOREGROUND" value="000101" />
         <option name="BACKGROUND" value="c7c7ff" />
       </value>
     </option>
         <option name="FOREGROUND" value="3c3d3c" />
         <option name="BACKGROUND" value="101010" />
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="3c3d3c" />
         <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="3c3d3c" />
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="BACKGROUND" value="161717" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
         <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="c7c7ff" />
       </value>
     </option>
     <option name="First symbol in list">
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
+        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="aa4e00" />
         <option name="ERROR_STRIPE_COLOR" value="f49810" />
-        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_CELL">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="GHERKIN_TEXT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="HAML_FILTER">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="HAML_FILTER_CONTENT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
     <option name="HAML_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_PARENTHS" name="HAML_PARENTHS" />
     <option name="HAML_RUBY_CODE">
       <value>
-        <option name="BACKGROUND" value="0" />
+        <option name="BACKGROUND" value="000000" />
       </value>
     </option>
     <option name="HAML_RUBY_START">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="HAML_TAG">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
-    <option name="HAML_TAG_NAME">
-      <value />
-    </option>
+    <option baseAttributes="HAML_CLASS" name="HAML_TAG_NAME" />
     <option name="HAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="HAML_WS_REMOVAL">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="HAML_XHTML">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
+    <option baseAttributes="XML_ATTRIBUTE_NAME" name="HTML_ATTRIBUTE_NAME" />
+    <option name="HTML_ATTRIBUTE_VALUE">
+      <value>
+        <option name="FOREGROUND" value="66CC33" />
+        <option name="FONT_TYPE" value="1" />
+      </value>
+    </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
+    <option baseAttributes="XML_TAG" name="HTML_TAG" />
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="EFFECT_COLOR" value="ffffff" />
-        <option name="EFFECT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_COLOR" value="c7c7ff" />
         <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="c7c7ff" />
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
+        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="333434" />
         <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
-        <option name="EFFECT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="INI.KEY">
-      <value>
-        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="IVAR" />
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="JAVA_BRACES" />
+    <option baseAttributes="TEXT" name="JAVA_BRACKETS" />
+    <option baseAttributes="TEXT" name="JAVA_COMMA" />
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
     <option name="JAVA_DOC_TAG">
       <value>
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="80807f" />
         <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="80807f" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="JAVA_DOT" />
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
         <option name="FOREGROUND" value="68e868" />
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="JAVA_PARENTH" />
+    <option baseAttributes="TEXT" name="JAVA_SEMICOLON" />
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
         <option name="BACKGROUND" value="423535" />
       </value>
     </option>
-    <option name="JS.BLOCK_COMEMNT">
-      <value>
-        <option name="FOREGROUND" value="9933cc" />
-      </value>
-    </option>
-    <option name="JS.GLOBAL_VARIABLE" baseAttributes="DEFAULT_GLOBAL_VARIABLE" />
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
         <option name="FOREGROUND" value="979748" />
         <option name="FOREGROUND" value="64a2a2" />
       </value>
     </option>
-    <option name="JS.NUMBER">
-      <value>
-        <option name="FOREGROUND" value="3387cc" />
-      </value>
-    </option>
-    <option name="JS.OPERATION_SIGN">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
     <option name="JS.PARAMETER">
       <value>
         <option name="FONT_TYPE" value="2" />
     </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="cccc33" />
+        <option name="FOREGROUND" value="CCCC33" />
       </value>
     </option>
-    <option name="JS.SEMICOLON">
-      <value />
-    </option>
-    <option name="JS.STATIC_MEMBER_FUNCTION">
+    <option name="LABEL">
       <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="JS.STATIC_MEMBER_VARIABLE">
-      <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="LESS_INJECTED_CODE">
       <value>
-        <option name="BACKGROUND" value="0" />
+        <option name="BACKGROUND" value="000000" />
       </value>
     </option>
     <option name="LESS_JS_CODE_DELIM">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
-        <option name="BACKGROUND" value="0" />
-      </value>
-    </option>
-    <option name="LESS_VARIABLE">
-      <value />
-    </option>
-    <option name="LOCALE.LINE_COMMENT">
-      <value>
-        <option name="FOREGROUND" value="9933cc" />
-      </value>
-    </option>
-    <option name="LOCALE.MSGCTXT_KEYWORD">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="LOCALE.MSGID_KEYWORD">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="LOCALE.MSGID_PLURAL_KEYWORD">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="LOCALE.MSGSTR_KEYWORD">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="LOCALE.MSGSTR_PLURAL_KEYWORD">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="LOCALE.STRING_LITERAL">
-      <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="BACKGROUND" value="000000" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="LESS_VARIABLE" />
+    <option baseAttributes="TEXT" name="LOCAL_VARIABLE_ATTRIBUTES" />
+    <option baseAttributes="OC.FUNCTION" name="MACRONAME" />
+    <option baseAttributes="TEXT" name="MACRO_PARAMETER" />
     <option name="MATCHED_BRACE_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="3a6da0" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="MESSAGE_ARGUMENT" />
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="80807f" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="OC.BADCHARACTER" />
     <option name="OC.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
-      </value>
-    </option>
-    <option name="OC.CONDITIONALLY_NOT_COMPILED">
-      <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
+    <option baseAttributes="OC.DOT" name="OC.BRACES" />
+    <option baseAttributes="OC.DOT" name="OC.BRACKETS" />
+    <option baseAttributes="OC.DOT" name="OC.COMMA" />
     <option name="OC.CPP_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="OC.DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="OC.ENUM_CONST">
-      <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="OC.DOT" />
+    <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.EXTERN_VARIABLE" />
+    <option baseAttributes="TEXT" name="OC.FUNCTION" />
+    <option baseAttributes="MESSAGE_ARGUMENT" name="OC.FUNCTION" />
+    <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.GLOBAL_VARIABLE" />
     <option name="OC.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="OC.LABEL">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="OC.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="OC.LOCAL_VARIABLE" />
     <option name="OC.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
+    <option baseAttributes="OC.DOT" name="OC.OPERATION_SIGN" />
     <option name="OC.PARAMETER">
       <value>
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
+    <option baseAttributes="OC.DOT" name="OC.PARENTHS" />
+    <option baseAttributes="IVAR" name="OC.PROPERTY" />
     <option name="OC.SELFSUPERTHIS">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
+    <option baseAttributes="OC.DOT" name="OC.SEMICOLON" />
     <option name="OC.STRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="OC.STRUCT_FIELD">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
-      </value>
-    </option>
-    <option name="PHP_BAD_CHARACTER">
-      <value>
-        <option name="BACKGROUND" value="6e3b3b" />
-      </value>
-    </option>
-    <option name="PHP_COMMA">
-      <value />
-    </option>
-    <option name="PHP_COMMENT">
-      <value>
-        <option name="FOREGROUND" value="9933cc" />
-      </value>
-    </option>
-    <option name="PHP_CONSTANT">
-      <value>
-        <option name="FOREGROUND" value="3387cc" />
-      </value>
-    </option>
-    <option name="PHP_DOC_COMMENT_ID">
-      <value>
-        <option name="FOREGROUND" value="9933cc" />
-      </value>
-    </option>
-    <option name="PHP_DOC_TAG">
-      <value>
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="PHP_ESCAPE_SEQUENCE">
-      <value>
-        <option name="FOREGROUND" value="3387cc" />
-      </value>
-    </option>
-    <option name="PHP_EXEC_COMMAND_ID">
-      <value>
-        <option name="FOREGROUND" value="66cc33" />
-      </value>
-    </option>
-    <option name="PHP_HEREDOC_CONTENT">
-      <value>
-        <option name="FOREGROUND" value="66cc33" />
-      </value>
-    </option>
-    <option name="PHP_HEREDOC_ID">
-      <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
-    <option name="PHP_IDENTIFIER">
-      <value />
-    </option>
-    <option name="PHP_KEYWORD">
+    <option name="OC_FORMAT_TOKEN">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="PHP_MARKUP_ID">
-      <value>
-        <option name="BACKGROUND" value="223f22" />
-      </value>
-    </option>
-    <option name="PHP_NUMBER">
-      <value>
-        <option name="FOREGROUND" value="3387cc" />
-      </value>
-    </option>
-    <option name="PHP_OPERATION_SIGN">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="PHP_PREDEFINED SYMBOL">
-      <value />
-    </option>
-    <option name="PHP_SEMICOLON">
-      <value />
-    </option>
-    <option name="PHP_STRING">
-      <value>
-        <option name="FOREGROUND" value="66cc33" />
-      </value>
-    </option>
-    <option name="PHP_TAG">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="PHP_VAR">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="PARAMETER_ATTRIBUTES" />
+    <option baseAttributes="CLASS_REFERENCE" name="PROTOCOL_REFERENCE" />
+    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
+    <option name="PHP_PARAMETER" baseAttributes="DEFAULT_PARAMETER" />
     <option name="PUPPET_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
     </option>
     <option name="PUPPET_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_BRACES" name="PUPPET_BRACES" />
+    <option baseAttributes="DEFAULT_BRACKETS" name="PUPPET_BRACKETS" />
     <option name="PUPPET_CLASS">
       <value>
-        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_COMMA" name="PUPPET_COMMA" />
+    <option baseAttributes="DEFAULT_DOT" name="PUPPET_DOT" />
     <option name="PUPPET_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="PUPPET_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="PUPPET_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="PUPPET_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_PARENTHS" name="PUPPET_PARENTH" />
     <option name="PUPPET_REGEX">
       <value>
-        <option name="FOREGROUND" value="cccc33" />
+        <option name="FOREGROUND" value="CCCC33" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="PUPPET_RESOURCE_REFERENCE" />
+    <option baseAttributes="DEFAULT_SEMICOLON" name="PUPPET_SEMICOLON" />
     <option name="PUPPET_SQ_STRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="PUPPET_STRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_LOCAL_VARIABLE" name="PUPPET_VARIABLE" />
     <option name="PUPPET_VARIABLE_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_BRACES" name="PY.BRACES" />
+    <option baseAttributes="DEFAULT_BRACKETS" name="PY.BRACKETS" />
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="c83730" />
+        <option name="FOREGROUND" value="C83730" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="PY.CLASS_DEFINITION" />
+    <option baseAttributes="DEFAULT_COMMA" name="PY.COMMA" />
+    <option baseAttributes="TEXT" name="PY.DECORATOR" />
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
-      </value>
-    </option>
-    <option name="PY.INVALID_STRING_ESCAPE">
-      <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_DOT" name="PY.DOT" />
+    <option baseAttributes="TEXT" name="PY.FUNC_DEFINITION" />
+    <option baseAttributes="DEFAULT_INVALID_STRING_ESCAPE" name="PY.INVALID_STRING_ESCAPE" />
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_PARENTHS" name="PY.PARENTHS" />
+    <option baseAttributes="TEXT" name="PY.PREDEFINED_DEFINITION" />
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="c83730" />
+        <option name="FOREGROUND" value="C83730" />
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
-      </value>
-    </option>
-    <option name="REGEXP.BAD_CHARACTER">
-      <value>
-        <option name="BACKGROUND" value="6e3b3b" />
-      </value>
-    </option>
-    <option name="REGEXP.CHAR_CLASS">
-      <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
-    <option name="REGEXP.COMMA">
-      <value />
-    </option>
-    <option name="REGEXP.COMMENT">
+    <option name="REST.BOLD">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
-      </value>
-    </option>
-    <option name="REGEXP.ESC_CHARACTER">
-      <value>
-        <option name="FOREGROUND" value="3387cc" />
-      </value>
-    </option>
-    <option name="REGEXP.INVALID_STRING_ESCAPE">
-      <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
-      </value>
-    </option>
-    <option name="REGEXP.META">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="REGEXP.QUOTE_CHARACTER">
-      <value>
-        <option name="FOREGROUND" value="3387cc" />
-      </value>
-    </option>
-    <option name="REGEXP.REDUNDANT_ESCAPE">
-      <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="REST.FIXED">
         <option name="BACKGROUND" value="4d5d3d" />
       </value>
     </option>
+    <option name="REST.ITALIC">
+      <value>
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
+    <option baseAttributes="XML_TAG" name="RHTML_EXPRESSION_END_ID" />
+    <option baseAttributes="XML_TAG" name="RHTML_EXPRESSION_START_ID" />
+    <option baseAttributes="XML_TAG" name="RHTML_OMIT_NEW_LINE_ID" />
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
       <value>
-        <option name="BACKGROUND" value="0" />
+        <option name="BACKGROUND" value="000000" />
       </value>
     </option>
+    <option baseAttributes="XML_TAG" name="RHTML_SCRIPTLET_END_ID" />
+    <option baseAttributes="XML_TAG" name="RHTML_SCRIPTLET_START_ID" />
+    <option baseAttributes="TEXT" name="RUBY_BAD_CHARACTER" />
+    <option baseAttributes="DEFAULT_BRACKETS" name="RUBY_BRACKETS" />
+    <option baseAttributes="DEFAULT_SEMICOLON" name="RUBY_COLON" />
+    <option baseAttributes="DEFAULT_COMMA" name="RUBY_COMMA" />
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
-        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
+    <option baseAttributes="RUBY_IDENTIFIER" name="RUBY_CVAR" />
+    <option baseAttributes="DEFAULT_DOT" name="RUBY_DOT" />
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
+    <option baseAttributes="RUBY_IDENTIFIER" name="RUBY_GVAR" />
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="RUBY_IDENTIFIER" />
     <option name="RUBY_INTERPOLATED_STRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
-      </value>
-    </option>
-    <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
-      <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_INVALID_STRING_ESCAPE" name="RUBY_INVALID_ESCAPE_SEQUENCE" />
+    <option baseAttributes="RUBY_IDENTIFIER" name="RUBY_IVAR" />
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
+    <option baseAttributes="RUBY_IDENTIFIER" name="RUBY_LOCAL_VAR_ID" />
+    <option baseAttributes="RUBY_IDENTIFIER" name="RUBY_METHOD_NAME" />
+    <option baseAttributes="TEXT" name="RUBY_NTH_REF" />
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="c83730" />
+        <option name="FOREGROUND" value="C83730" />
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="cccc33" />
+        <option name="FOREGROUND" value="CCCC33" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_SEMICOLON" name="RUBY_SEMICOLON" />
+    <option baseAttributes="RUBY_IDENTIFIER" name="RUBY_SPECIFIC_CALL" />
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="SASS_DEFAULT">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="SASS_EXTEND">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="SASS_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="c83730" />
+        <option name="FOREGROUND" value="C83730" />
       </value>
     </option>
-    <option name="SASS_IDENTIFIER">
-      <value />
-    </option>
+    <option baseAttributes="CSS.IDENT" name="SASS_IDENTIFIER" />
     <option name="SASS_IMPORTANT">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
-    <option name="SASS_MIXIN">
-      <value />
+    <option name="SASS_KEYWORD">
+      <value>
+        <option name="FOREGROUND" value="CC7833" />
+      </value>
     </option>
-    <option name="SASS_STRING">
+    <option baseAttributes="DEFAULT_KEYWORD" name="SASS_MIXIN" />
+    <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
-    <option name="SASS_TAG_NAME">
-      <value />
+    <option name="SASS_PROPERTY_NAME">
+      <value>
+        <option name="FONT_TYPE" value="1" />
+      </value>
     </option>
+    <option name="SASS_PROPERTY_VALUE">
+      <value>
+        <option name="FOREGROUND" value="68e868" />
+        <option name="FONT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="SASS_STRING">
+      <value>
+        <option name="FOREGROUND" value="66CC33" />
+      </value>
+    </option>
+    <option baseAttributes="CSS.TAG_NAME" name="SASS_TAG_NAME" />
     <option name="SASS_URL">
       <value>
         <option name="FONT_TYPE" value="2" />
     </option>
     <option name="SLIM_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="SLIM_CALL">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
+    <option baseAttributes="SLIM_TAG" name="SLIM_CLASS" />
     <option name="SLIM_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
+    <option baseAttributes="SLIM_TAG" name="SLIM_DOCTYPE_KWD" />
+    <option baseAttributes="SLIM_TAG" name="SLIM_FILTER" />
     <option name="SLIM_FILTER_CONTENT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
+    <option baseAttributes="SLIM_TAG" name="SLIM_ID" />
     <option name="SLIM_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_PARENTHS" name="SLIM_PARENTHS" />
     <option name="SLIM_RUBY_CODE">
       <value>
-        <option name="BACKGROUND" value="0" />
+        <option name="BACKGROUND" value="000000" />
       </value>
     </option>
     <option name="SLIM_STATIC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="SLIM_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="SLIM_TAG">
       <value>
-        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
+    <option baseAttributes="HAML_TEXT" name="SLIM_TAG_ATTR_KEY" />
     <option name="SLIM_TAG_START">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="FFFFFF" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
-    <option name="SMARTY_BACKGROUND">
-      <value />
-    </option>
-    <option name="SMARTY_BAD_CHARACTER">
-      <value>
-        <option name="BACKGROUND" value="6e3b3b" />
-      </value>
-    </option>
-    <option name="SMARTY_COMMENT">
-      <value>
-        <option name="FOREGROUND" value="9933cc" />
-      </value>
-    </option>
-    <option name="SMARTY_IDENTIFIER">
-      <value />
-    </option>
-    <option name="SPY-JS.EXCEPTION">
-      <value>
-        <option name="BACKGROUND" value="532b2e" />
-        <option name="EFFECT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="SPY-JS.FUNCTION_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3a3a3a" />
-        <option name="EFFECT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="SPY-JS.PATH_LEVEL_ONE">
-      <value>
-        <option name="BACKGROUND" value="425f44" />
-        <option name="EFFECT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="SPY-JS.PATH_LEVEL_TWO">
-      <value>
-        <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="SPY-JS.PROGRAM_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3a3a3a" />
-        <option name="EFFECT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="SPY-JS.VALUE_HINT">
-      <value>
-        <option name="EFFECT_COLOR" value="a9b7c6" />
-      </value>
-    </option>
-    <option name="SQL_BAD_CHARACTER">
-      <value>
-        <option name="BACKGROUND" value="6e3b3b" />
-      </value>
-    </option>
-    <option name="SQL_COLUMN">
+    <option name="STATIC_FIELD_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="SQL_COMMA">
-      <value />
-    </option>
-    <option name="SQL_COMMENT">
-      <value>
-        <option name="FOREGROUND" value="9933cc" />
-      </value>
-    </option>
-    <option name="SQL_DATABASE_OBJECT">
-      <value />
-    </option>
-    <option name="SQL_IDENT">
-      <value />
-    </option>
-    <option name="SQL_IDENT_DELIMITED">
-      <value />
-    </option>
-    <option name="SQL_KEYWORD">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="SQL_LOCAL_ALIAS">
-      <value />
-    </option>
-    <option name="SQL_NUMBER">
-      <value>
-        <option name="FOREGROUND" value="3387cc" />
+        <option name="FONT_TYPE" value="3" />
       </value>
     </option>
-    <option name="SQL_PARAMETER">
-      <value />
-    </option>
-    <option name="SQL_PROCEDURE">
+    <option name="STATIC_METHOD_ATTRIBUTES">
       <value>
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="SQL_SCHEMA">
-      <value />
-    </option>
-    <option name="SQL_SEMICOLON">
-      <value />
-    </option>
-    <option name="SQL_STRING">
-      <value>
-        <option name="FOREGROUND" value="66cc33" />
-      </value>
-    </option>
-    <option name="SQL_SYNTHETIC_ENTITY">
-      <value>
-        <option name="FOREGROUND" value="fda5ff" />
-      </value>
-    </option>
-    <option name="SQL_TABLE">
-      <value />
-    </option>
-    <option name="STATIC_FIELD_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
-      </value>
-    </option>
-    <option name="TAG_ATTR_KEY">
-      <value />
-    </option>
+    <option baseAttributes="HAML_TEXT" name="TAG_ATTR_KEY" />
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
-        <option name="BACKGROUND" value="0" />
+        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="BACKGROUND" value="000000" />
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="ff00" />
+        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
         <option name="ERROR_STRIPE_COLOR" value="ff" />
       </value>
     </option>
-    <option name="TWIG_BACKGROUND">
-      <value />
-    </option>
-    <option name="TWIG_BAD_CHARACTER">
-      <value>
-        <option name="BACKGROUND" value="6e3b3b" />
-      </value>
-    </option>
-    <option name="TWIG_COMMENT">
-      <value>
-        <option name="FOREGROUND" value="9933cc" />
-      </value>
-    </option>
-    <option name="TWIG_IDENTIFIER">
-      <value />
-    </option>
-    <option name="TWIG_KEYWORD">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="TWIG_NUMBER">
-      <value>
-        <option name="FOREGROUND" value="3387cc" />
-      </value>
-    </option>
-    <option name="TWIG_OPERATION_SIGN">
-      <value>
-        <option name="FOREGROUND" value="cc7833" />
-      </value>
-    </option>
-    <option name="TWIG_STRING">
-      <value>
-        <option name="FOREGROUND" value="66cc33" />
-      </value>
-    </option>
+    <option baseAttributes="TEXT" name="TYPEDEF" />
     <option name="UNMATCHED_BRACE_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="583535" />
     <option name="WARNING_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="4a3f10" />
-        <option name="EFFECT_COLOR" value="ffffff" />
-        <option name="ERROR_STRIPE_COLOR" value="ebc700" />
         <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="FFFFFF" />
+        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
         <option name="BACKGROUND" value="623062" />
       </value>
     </option>
-    <option name="XML_TAG">
-      <value />
+    <option baseAttributes="TEXT" name="XML_ATTRIBUTE_NAME" />
+    <option name="XML_ATTRIBUTE_VALUE">
+      <value>
+        <option name="FOREGROUND" value="66CC33" />
+      </value>
+    </option>
+    <option name="XML_ENTITY_REFERENCE">
+      <value>
+        <option name="FOREGROUND" value="3387CC" />
+      </value>
+    </option>
+    <option name="XML_PROLOGUE">
+      <value>
+        <option name="FONT_TYPE" value="2" />
+      </value>
     </option>
+    <option baseAttributes="TEXT" name="XML_TAG" />
     <option name="XML_TAG_DATA">
       <value>
         <option name="FONT_TYPE" value="1" />
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="EFFECT_COLOR" value="ffffff" />
-        <option name="EFFECT_TYPE" value="1" />
+        <option name="FOREGROUND" value="e3e3ff" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="9933CC" />
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="cc7833" />
+        <option name="FOREGROUND" value="CC7833" />
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="66cc33" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
   </attributes>
-</scheme>
\ No newline at end of file
+</scheme>
index a45822a53d91267bc2aa6fd8896ebfa9f871e522..56c8781cc3fbd4a774743d8d58c5fb9657ab1559 100644 (file)
@@ -1,17 +1,17 @@
-<scheme name="Blackboard" version="142" parent_scheme="Default">
+<scheme name="Blackboard" parent_scheme="Default" version="1">
   <option name="LINE_SPACING" value="1.0" />
   <option name="EDITOR_FONT_SIZE" value="12" />
   <option name="EDITOR_FONT_NAME" value="Menlo" />
   <colors>
-    <option name="CARET_COLOR" value="ffffff" />
-    <option name="CARET_ROW_COLOR" value="1a1e2e" />
-    <option name="CONSOLE_BACKGROUND_KEY" value="c1021" />
-    <option name="GUTTER_BACKGROUND" value="c1021" />
+    <option name="CONSOLE_BACKGROUND_KEY" value="0C1021" />
     <option name="INDENT_GUIDE" value="484b58" />
-    <option name="LINE_NUMBERS_COLOR" value="f8f8f8" />
-    <option name="SELECTED_INDENT_GUIDE" value="484b58" />
-    <option name="SELECTION_BACKGROUND" value="253b76" />
+    <option name="SELECTION_BACKGROUND" value="253B76" />
+    <option name="CARET_ROW_COLOR" value="1a1e2e" />
     <option name="WHITESPACES" value="484b58" />
+    <option name="CARET_COLOR" value="FFFFFF" />
+    <option name="LINE_NUMBERS_COLOR" value="F8F8F8" />
+    <option name="SELECTED_INDENT_GUIDE" value="484b58" />
+    <option name="GUTTER_BACKGROUND" value="0C1021" />
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
+      </value>
+    </option>
+    <option baseAttributes="TEXT" name="CLASS_NAME_ATTRIBUTES" />
+    <option name="CLASS_REFERENCE">
+      <value>
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_BRACES" name="COFFEESCRIPT.BRACE" />
+    <option baseAttributes="DEFAULT_BRACKETS" name="COFFEESCRIPT.BRACKET" />
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_COMMA" name="COFFEESCRIPT.COMMA" />
+    <option baseAttributes="DEFAULT_DOT" name="COFFEESCRIPT.DOT" />
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK" />
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
+    <option baseAttributes="COFFEESCRIPT.IDENTIFIER" name="COFFEESCRIPT.GLOBAL_VARIABLE" />
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="COFFEESCRIPT.IDENTIFIER" />
+    <option baseAttributes="DEFAULT_STRING" name="COFFEESCRIPT.JAVASCRIPT_CONTENT" />
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
+    <option baseAttributes="COFFEESCRIPT.IDENTIFIER" name="COFFEESCRIPT.LOCAL_VARIABLE" />
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="COFFEESCRIPT.OBJECT_KEY" />
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_PARENTHS" name="COFFEESCRIPT.PARENTHESIS" />
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_DOT" name="COFFEESCRIPT.RANGE" />
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_SEMICOLON" name="COFFEESCRIPT.SEMICOLON" />
+    <option baseAttributes="DEFAULT_DOT" name="COFFEESCRIPT.SPLAT" />