Merge remote-tracking branch 'remotes/origin/avu/IDEA_146319_Move_PyCharm_proclist'
authorAlexey Ushakov <Alexey.Ushakov@jetbrains.com>
Tue, 1 Dec 2015 08:42:55 +0000 (11:42 +0300)
committerAlexey Ushakov <Alexey.Ushakov@jetbrains.com>
Tue, 1 Dec 2015 08:42:55 +0000 (11:42 +0300)
589 files changed:
.idea/libraries/Eclipse.xml
bin/scripts/unix/idea.sh
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/forms-compiler/forms-compiler.iml
java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/TextAreasTest.java
java/compiler/impl/src/com/intellij/compiler/server/DefaultMessageHandler.java
java/debugger/impl/src/com/intellij/debugger/engine/JVMNameUtil.java
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MethodEvaluator.java
java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java
java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java
java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java
java/debugger/impl/src/com/intellij/debugger/ui/AlternativeSourceNotificationProvider.java
java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java
java/execution/impl/src/com/intellij/execution/application/ApplicationRunLineMarkerProvider.java
java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.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/ExpectedTypesProvider.java
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DelegateWithDefaultParamValueIntentionAction.java
java/java-impl/src/com/intellij/codeInsight/generation/ConstructorBodyGenerator.java
java/java-impl/src/com/intellij/codeInsight/generation/ConstructorBodyGeneratorBase.java [new file with mode: 0644]
java/java-impl/src/com/intellij/codeInsight/generation/ConstructorBodyGeneratorEx.java [moved from platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/KeyboardShortcutBean.java with 50% similarity]
java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
java/java-impl/src/com/intellij/codeInsight/generation/JavaConstructorBodyWithSuperCallGenerator.java
java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java
java/java-impl/src/com/intellij/codeInsight/generation/NewJavaConstructorBodyWithSuperCallGenerator.java [moved from platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/SeparatorBean.java with 66% similarity]
java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java
java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
java/java-impl/src/com/intellij/refactoring/introduceParameter/AbstractJavaInplaceIntroducer.java
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.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/util/ClsElementWritingAccessProvider.java
java/java-impl/src/com/intellij/refactoring/util/InlineUtil.java
java/java-impl/src/com/intellij/testIntegration/TestRunLineMarkerProvider.java
java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java
java/java-impl/src/com/intellij/unscramble/UnscrambleListener.java
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
java/java-psi-api/java-psi-api.iml
java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java
java/java-psi-api/src/com/intellij/psi/util/PsiClassUtil.java
java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
java/java-psi-api/src/com/intellij/psi/util/RedundantCastUtil.java
java/java-psi-api/src/com/intellij/psi/util/TypesDistinctProver.java
java/java-psi-impl/src/com/intellij/codeInsight/generation/OverrideImplementExploreUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/EmptySubstitutorImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClassFileStubBuilder.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.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/PsiPolyExpressionUtil.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-tests/testData/codeInsight/completion/normalSorting/PreferCollectionsStaticOfExpectedType.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/InjectedAnnotator.xml
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/SwitchStatement.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57336.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA106964.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA148348.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA57311.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA67746.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/SuperWildcardCapturedSuperExtendsWildcardCapturedExtends.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/diamond/NoRawTypeInferenceWhenNewExpressionHasSpecifiedType.java [new file with mode: 0644]
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/IncompatibleBoundsFromAssignment.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/IntersectionWithArray.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/OuterCallConflictResolution.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AmbiguityReturnValueResolution2.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AmbiguityReturnValueResolution3.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/ReturnTypeCompatibility.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/ReturnTypeCompatibility1.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/incomplete/InsideParenthesis.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/InferenceFromReturnType.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/MethodTypeParamsInference.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/RawQualifier.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/ReturnTypeSpecific.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/mostSpecific/JDK8034223.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/mostSpecific/TargetTypeParameter.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/IDEA106670.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/HighlightReferenceWhenContradictBoundsAreInferred.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/IDEA148553.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/SecondSearchIfFirstParameterIsASubtypeOfReferenceTypeFromExpressionDeclaration.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/DetectPolyExpressionInReturnsOfExplicitlyTypedLambdaWhenPrimitiveCouldWin.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/FunctionalInterfaceIncompatibilityBasedOnAbsenceOfVoidToTypeConvertion.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/NoBoxingWithNullType.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/PertinentToApplicabilityOfExplicitlyTypedLambda.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/params/FormalParams.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/wildcardParametrization/PrimitiveParameterTypes.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/delegateWithDefaultValue/afterStaticMethodInInterface.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/delegateWithDefaultValue/beforeStaticMethodInInterface.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/generateConstructor/afterSameNamedFields.java
java/java-tests/testData/inspection/dataFlow/fixture/AssertThat.java
java/java-tests/testData/inspection/dataFlow/fixture/LiteralIfCondition.java [new file with mode: 0644]
java/java-tests/testData/refactoring/inplaceIntroduceVariable/injectedString.java [new file with mode: 0644]
java/java-tests/testData/refactoring/inplaceIntroduceVariable/injectedString_after.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/codeInsight/OverrideImplementTest.groovy
java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingPerformanceTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/RecursiveVisitorTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Diamond8HighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlightingGenerated8Test.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Java8ExpressionsCheckTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java
java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
java/java-tests/testSrc/com/intellij/find/FindInEditorTest.java
java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
java/java-tests/testSrc/com/intellij/index/IndexTest.groovy
java/java-tests/testSrc/com/intellij/navigation/GotoImplementationHandlerTest.java
java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java
java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java
java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/JavaAutoDetectIndentPerformanceTest.java
java/java-tests/testSrc/com/intellij/psi/formatter/performance/JavaFormatterPerformanceTest.java
java/java-tests/testSrc/com/intellij/psi/formatter/performance/JavaSmartReformatPerformanceTest.java
java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/FindClassTest.java
java/java-tests/testSrc/com/intellij/psi/impl/smartPointers/SmartPsiElementPointersTest.java
java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceVariableTest.java
java/java-tests/testSrc/com/intellij/roots/ModuleScopesTest.java
java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
java/testFramework/src/com/intellij/testFramework/CompilerTester.java
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/FluentIterableConversionUtil.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/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/t143/after/Test.items
java/typeMigration/testData/refactoring/typeMigration/t144/after/Test.items
lib/ecj-4.4.2.jar [moved from lib/ecj-4.4.jar with 62% similarity]
lib/required_for_dist.txt
platform/bootstrap/src/com/intellij/ide/BootstrapClassLoaderUtil.java
platform/bootstrap/src/com/intellij/idea/Main.java
platform/core-api/src/com/intellij/openapi/components/ComponentManager.java
platform/core-api/src/com/intellij/openapi/project/IndexNotReadyException.java
platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
platform/core-api/src/com/intellij/psi/ElementManipulator.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-api/src/org/jetbrains/concurrency/Promise.java
platform/core-impl/src/com/intellij/codeInsight/completion/OffsetTranslator.java
platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
platform/core-impl/src/com/intellij/openapi/editor/impl/RangeMarkerTree.java
platform/core-impl/src/com/intellij/openapi/vfs/impl/ZipHandler.java
platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/CoreJarVirtualFile.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/DirElementInfo.java
platform/core-impl/src/com/intellij/psi/impl/smartPointers/FileElementInfo.java
platform/core-impl/src/com/intellij/psi/impl/smartPointers/HardElementInfo.java
platform/core-impl/src/com/intellij/psi/impl/smartPointers/InjectedSelfElementInfo.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/smartPointers/SmartPsiFileRangePointerImpl.java
platform/core-impl/src/com/intellij/psi/impl/source/tree/SharedImplUtil.java
platform/diff-api/src/com/intellij/diff/DiffExtension.java
platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java
platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java
platform/diff-impl/src/com/intellij/diff/merge/TextMergeTool.java
platform/diff-impl/src/com/intellij/diff/statistics/DiffUsagesCollector.java [deleted file]
platform/diff-impl/src/com/intellij/diff/statistics/DiffUsagesCollector.kt [new file with mode: 0644]
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/util/DiffNotifications.java
platform/diff-impl/src/com/intellij/diff/tools/util/FocusTrackerSupport.java
platform/diff-impl/src/com/intellij/diff/tools/util/SyncScrollSupport.java
platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideTextDiffViewer.java
platform/dvcs-impl/testSrc/com.intellij.dvcs/VcsRepositoryManagerTest.java
platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java
platform/forms_rt/forms_rt.iml
platform/icons/src/runConfigurations/testState/run_run.png [new file with mode: 0644]
platform/icons/src/runConfigurations/testState/run_run@2x.png [new file with mode: 0644]
platform/icons/src/windows/appIconOk512.png
platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/component/ArrangementAtomMatchConditionComponent.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ExternalToolPass.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ExternalToolPassFactory.java
platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java
platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java
platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceMatchingUtil.java
platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
platform/lang-impl/src/com/intellij/find/EditorSearchSession.java
platform/lang-impl/src/com/intellij/find/impl/FindDialog.java
platform/lang-impl/src/com/intellij/ide/FileListPasteProvider.java
platform/lang-impl/src/com/intellij/ide/actions/CreateFileAction.java
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilter.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java
platform/lang-impl/src/com/intellij/lang/parser/GeneratedParserUtilBase.java
platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java
platform/lang-impl/src/com/intellij/openapi/util/SwitchBootJdkAction.java
platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectAction.java
platform/lang-impl/src/com/intellij/psi/search/PredefinedSearchScopeProviderImpl.java
platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java
platform/lang-impl/src/com/intellij/ui/tabs/FileColorConfigurationEditDialog.java
platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java
platform/lang-impl/src/com/intellij/util/JdkBundle.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/util/JdkBundleList.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/util/SequentialModalProgressTask.java
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
platform/lang-impl/src/com/intellij/util/indexing/IndexAccessValidator.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/webcore/packaging/ManagePackagesDialog.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/actionSystem/ex/ComboBoxAction.java
platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java
platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java
platform/platform-impl/src/com/intellij/diagnostic/DebugLogManager.java [deleted file]
platform/platform-impl/src/com/intellij/diagnostic/DebugLogManager.kt [new file with mode: 0644]
platform/platform-impl/src/com/intellij/diagnostic/DefaultIdeaErrorLogger.java
platform/platform-impl/src/com/intellij/diagnostic/OutOfMemoryDialog.form
platform/platform-impl/src/com/intellij/diagnostic/OutOfMemoryDialog.java
platform/platform-impl/src/com/intellij/diagnostic/VMOptions.java
platform/platform-impl/src/com/intellij/execution/process/KillableColoredProcessHandler.java
platform/platform-impl/src/com/intellij/ide/actions/AboutPopup.java
platform/platform-impl/src/com/intellij/ide/actions/DebugLogConfigureAction.java [deleted file]
platform/platform-impl/src/com/intellij/ide/actions/DebugLogConfigureAction.kt [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ide/actions/EditCustomPropertiesAction.kt [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
platform/platform-impl/src/com/intellij/idea/StartupUtil.java
platform/platform-impl/src/com/intellij/internal/statistic/StatisticsUploadAssistant.java
platform/platform-impl/src/com/intellij/internal/statistic/UsagesCollector.java
platform/platform-impl/src/com/intellij/internal/statistic/connect/RemotelyConfigurableStatisticsService.java
platform/platform-impl/src/com/intellij/internal/statistic/persistence/ApplicationStatisticsPersistenceComponent.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionBean.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionGroupBean.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionManagerConfiguration.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/ActionReferenceBean.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/config/AddToGroupBean.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.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/EditorSizeManager.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/VisualLinesIterator.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorEmptyTextPainter.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java
platform/platform-impl/src/com/intellij/openapi/progress/util/ReadTask.java
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/UpdateSettings.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeBackgroundUtil.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
platform/platform-impl/src/com/intellij/ui/EditorNotificationsImpl.java
platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java
platform/platform-impl/src/com/intellij/util/ui/table/JBListTable.java
platform/platform-impl/src/org/jetbrains/concurrency/promise.kt
platform/platform-resources-en/src/messages/ActionsBundle.properties
platform/platform-resources-en/src/messages/DiagnosticBundle.properties
platform/platform-resources-en/src/messages/IdeBundle.properties
platform/platform-resources-en/src/messages/InspectionsBundle.properties
platform/platform-resources/src/META-INF/LangExtensions.xml
platform/platform-resources/src/brokenPlugins.txt
platform/platform-resources/src/idea/PlatformActions.xml
platform/platform-resources/src/idea/VcsActions.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/highlighter/custom/CustomFileTypeLexerTest.groovy
platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorCreationPerformanceTest.java [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/editor/impl/RangeMarkerTest.java
platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java
platform/platform-tests/testSrc/com/intellij/openapi/progress/impl/ProgressIndicatorTest.java
platform/platform-tests/testSrc/com/intellij/openapi/util/io/FileUtilPerformanceTest.java
platform/platform-tests/testSrc/com/intellij/openapi/util/text/StringUtilPerformanceTest.java
platform/platform-tests/testSrc/com/intellij/openapi/vfs/ArchiveFileSystemPerformanceTest.kt
platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilPerformanceTest.java
platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java
platform/platform-tests/testSrc/com/intellij/psi/tree/TokenSetTest.java
platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilMatchingTest.groovy
platform/platform-tests/testSrc/com/intellij/ui/FileNameSplittingTest.java
platform/platform-tests/testSrc/com/intellij/util/JdkBundleListTest.java [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/util/JdkBundleTest.java [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/util/containers/ContainerUtilTest.java
platform/platform-tests/testSrc/com/intellij/util/containers/TreeTraverserTest.java
platform/platform-tests/testSrc/com/intellij/util/io/BTreeEnumeratorTest.java
platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTest.java
platform/platform-tests/testSrc/com/intellij/util/io/StringEnumeratorTest.java
platform/projectModel-api/src/com/intellij/openapi/roots/OrderEnumerationHandler.java [moved from platform/projectModel-impl/src/com/intellij/openapi/roots/OrderEnumerationHandler.java with 98% similarity]
platform/projectModel-api/src/com/intellij/openapi/roots/OrderEnumerator.java
platform/projectModel-api/src/com/intellij/openapi/roots/OrderEnumeratorSettings.java [moved from platform/projectModel-impl/src/com/intellij/openapi/roots/OrderEnumeratorSettings.java with 94% similarity]
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryIndex.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleFileIndexImpl.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexImpl.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
platform/script-debugger/backend/src/org/jetbrains/debugger/Breakpoint.kt
platform/script-debugger/backend/src/org/jetbrains/debugger/BreakpointManager.kt
platform/script-debugger/backend/src/org/jetbrains/debugger/FunctionSupport.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContext.kt
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/rpc/CommandSenderBase.kt
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/ValueNodeAsyncFunction.kt [deleted file]
platform/script-debugger/protocol/protocol-model-generator/generated/ProtocolSchemaReaderImpl.kt
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/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/OutMessage.kt
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/SubtypeCaster.kt [deleted file]
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/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java
platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
platform/testFramework/src/com/intellij/testFramework/ThreadTracker.java
platform/util-rt/src/com/intellij/util/Functions.java
platform/util/resources/misc/registry.properties
platform/util/src/com/intellij/icons/AllIcons.java
platform/util/src/com/intellij/openapi/application/PathManager.java
platform/util/src/com/intellij/openapi/util/IconLoader.java
platform/util/src/com/intellij/util/ConcurrencyUtil.java
platform/util/src/com/intellij/util/VersionUtil.java
platform/util/src/com/intellij/util/WaitFor.java
platform/util/src/com/intellij/util/containers/JBIterable.java
platform/util/src/com/intellij/util/io/BaseDataReader.java
platform/util/src/com/intellij/util/io/PagedFileStorage.java
platform/util/src/com/intellij/util/ui/JBUI.java
platform/util/testSrc/com/intellij/util/VersionUtilTest.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ShowChangesViewAction.java [deleted file]
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesViewProvider.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowser.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java
platform/vcs-impl/src/com/intellij/vcs/AnnotationProviderEx.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneDeclaresCloneNotSupportedInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/UnnecessaryLocalVariableInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RefusedBequestInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/MissingDeprecatedAnnotationInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodUtils.java
plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java
plugins/InspectionGadgets/src/inspectionDescriptions/DoubleBraceInitialization.html
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Comment1.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Comment1.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Comment2.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Comment2.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Comment3.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Comment3.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/SlashSlashInLiteral.after.java
plugins/InspectionGadgets/test/com/siyeh/igtest/javadoc/missing_deprecated_annotation/MissingDeprecatedAnnotation.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/style/StringBufferReplaceableByStringFixTest.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceMethodRefWithLambdaIntention.java
plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/ExprRefs_after.java
plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/RedundantCast.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/types/methodRefs2lambda/RedundantCast_after.java [new file with mode: 0644]
plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/types/ReplaceMethodReferenceWithLambdaIntentionTest.java
plugins/ant/tests/src/com/intellij/lang/ant/AntHighlightingTest.java
plugins/devkit/resources/icons/add_sdk.png
plugins/devkit/resources/icons/add_sdk@2x.png
plugins/devkit/resources/icons/add_sdk@2x_dark.png [new file with mode: 0644]
plugins/devkit/resources/icons/add_sdk_dark.png [new file with mode: 0644]
plugins/devkit/resources/icons/sdk_closed.png
plugins/devkit/resources/icons/sdk_closed@2x.png
plugins/devkit/resources/icons/sdk_closed@2x_dark.png [new file with mode: 0644]
plugins/devkit/resources/icons/sdk_closed_dark.png [new file with mode: 0644]
plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/importProject/CloudGitProjectStructureDetector.java
plugins/git4idea/src/git4idea/GitStatisticsCollector.kt
plugins/git4idea/src/git4idea/GitUtil.java
plugins/git4idea/src/git4idea/log/GitShowExternalLogAction.java
plugins/git4idea/src/git4idea/repo/GitRepositoryCreator.java
plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java
plugins/git4idea/src/git4idea/repo/GitUntrackedFilesHolder.java
plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java
plugins/github/src/org/jetbrains/plugins/github/util/GithubUrlUtil.java
plugins/gradle/gradle.iml
plugins/gradle/jps-plugin/gradle-jps-plugin.iml
plugins/gradle/lib/gradle-2.9-src.zip [moved from plugins/gradle/lib/gradle-2.5-src.zip with 79% similarity]
plugins/gradle/lib/gradle-base-services-2.9.jar [moved from plugins/gradle/lib/gradle-base-services-2.5.jar with 66% similarity]
plugins/gradle/lib/gradle-base-services-groovy-2.5.jar [deleted file]
plugins/gradle/lib/gradle-base-services-groovy-2.9.jar [new file with mode: 0644]
plugins/gradle/lib/gradle-cli-2.9.jar [moved from plugins/gradle/lib/gradle-cli-2.5.jar with 86% similarity]
plugins/gradle/lib/gradle-core-2.9.jar [moved from plugins/gradle/lib/gradle-core-2.5.jar with 63% similarity]
plugins/gradle/lib/gradle-messaging-2.9.jar [moved from plugins/gradle/lib/gradle-messaging-2.5.jar with 67% similarity]
plugins/gradle/lib/gradle-model-core-2.5.jar [deleted file]
plugins/gradle/lib/gradle-model-core-2.9.jar [new file with mode: 0644]
plugins/gradle/lib/gradle-model-groovy-2.5.jar [deleted file]
plugins/gradle/lib/gradle-model-groovy-2.9.jar [new file with mode: 0644]
plugins/gradle/lib/gradle-native-2.5.jar [deleted file]
plugins/gradle/lib/gradle-native-2.9.jar [new file with mode: 0644]
plugins/gradle/lib/gradle-resources-2.5.jar [deleted file]
plugins/gradle/lib/gradle-resources-2.9.jar [new file with mode: 0644]
plugins/gradle/lib/gradle-tooling-api-2.9.jar [moved from plugins/gradle/lib/gradle-tooling-api-2.5.jar with 53% similarity]
plugins/gradle/lib/gradle-wrapper-2.9.jar [moved from plugins/gradle/lib/gradle-wrapper-2.5.jar with 51% similarity]
plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.5.jar [deleted file]
plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.9.jar [new file with mode: 0644]
plugins/gradle/tooling-extension-api/lib/gradle-ide-2.5.jar [deleted file]
plugins/gradle/tooling-extension-api/lib/gradle-ide-2.9.jar [new file with mode: 0644]
plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.9.jar [moved from plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.5.jar with 66% similarity]
plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.9.jar [moved from plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.5.jar with 59% similarity]
plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.9.jar [moved from plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.5.jar with 50% similarity]
plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.5.jar [deleted file]
plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.9.jar [new file with mode: 0644]
plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.5.jar [deleted file]
plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.9.jar [new file with mode: 0644]
plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.5.jar [deleted file]
plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.9.jar [new file with mode: 0644]
plugins/gradle/tooling-extension-api/lib/gradle-scala-2.5.jar [deleted file]
plugins/gradle/tooling-extension-api/lib/gradle-scala-2.9.jar [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 [deleted file]
plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.9.jar [new file with mode: 0644]
plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.9.jar [moved from plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.5.jar with 90% similarity]
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dgm/DGMMemberContributor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/geb/GebPageMemberContributor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/GroovyConstructorNamedArgumentProvider.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyImportHelper.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrCatchClauseImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrForStatementImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/blocks/GrClosableBlockImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrEnumTypeDefinitionImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/toplevel/imports/GrImportStatementImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/DeclarationCacheKey.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GdkMethodDslProvider.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/PackageSkippingProcessor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/GrCollectionTypeMembersProvider.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/AccessorResolverProcessor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ClassHint.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ClassResolverProcessor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CompletionProcessor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/GrDelegatingScopeProcessorWithHints.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/GrScopeProcessorWithHints.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/PropertyResolverProcessor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/markup/XmlMarkupBuilderNonCodeMemberContributor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/spock/SpockMemberContributor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/swingBuilder/SwingBuilderNonCodeMemberContributor.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/dynamicMembers/DynamicMemberUtils.java
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrConstructorBodyGenerator.java
plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsoleUtil.java
plugins/groovy/src/org/jetbrains/plugins/groovy/console/actions/GrNewConsoleAction.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferenceExpression.java
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureSynchronizer.java
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/TestClassNode.java
plugins/groovy/src/org/jetbrains/plugins/groovy/shell/DefaultGroovyShellRunner.java
plugins/groovy/src/org/jetbrains/plugins/groovy/shell/GroovyShellActionBase.java
plugins/groovy/src/org/jetbrains/plugins/groovy/shell/GroovyShellCodeFragment.java
plugins/groovy/src/org/jetbrains/plugins/groovy/shell/GroovyShellConfig.java
plugins/groovy/src/org/jetbrains/plugins/groovy/util/ModuleChooserUtil.java
plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyAutoPopupTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyStressPerformanceTest.groovy
plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.kt
plugins/java-decompiler/plugin/test/org/jetbrains/java/decompiler/IdeaDecompilerTest.kt
plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java
plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathsAndSearchScopesTest.java
plugins/properties/testSrc/com/intellij/lang/properties/PropertiesEnterTest.java
plugins/svn4idea/src/META-INF/plugin.xml
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
plugins/svn4idea/src/org/jetbrains/idea/svn/WorkingCopiesContent.java
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java [deleted file]
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java
plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskManagerTest.java
plugins/testng/src/com/theoryinpractice/testng/util/TestNGUtil.java
python/helpers/packaging_tool.py
python/helpers/pydev/pydev_monkey.py
python/helpers/pydev/pydevd.py
python/helpers/pydev/pydevd_signature.py
python/helpers/pydev/pydevd_utils.py
python/ide/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
python/openapi/src/com/jetbrains/python/packaging/PyPackageManagers.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/psi/PyUtil.java
python/src/com/jetbrains/python/sdk/PySdkUpdater.java
python/src/com/jetbrains/python/testing/PythonUnitTestUtil.java
resources-en/src/messages/DebuggerBundle.properties
resources/src/META-INF/IdeaPlugin.xml
spellchecker/src/com/intellij/spellchecker/english.dic
spellchecker/testSrc/com/intellij/spellchecker/compress/DictionaryTest.java
spellchecker/testSrc/com/intellij/spellchecker/inspection/SpellcheckerPerformanceTest.java
xml/dom-impl/src/com/intellij/util/xml/structure/DomStructureViewTreeModel.java
xml/dom-tests/tests/com/intellij/util/xml/DomPerformanceTest.java
xml/impl/src/com/intellij/codeInsight/completion/HtmlTextCompletionConfidence.java
xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/ConvertSchemaPrefixToDefaultIntention.java
xml/tests/src/com/intellij/codeInsight/XmlParsingTest.java
xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java
xml/tests/src/com/intellij/codeInsight/completion/XmlSmartCompletionTest.java [moved from xml/tests/src/com/intellij/xml/XmlSmartCompletionTest.java with 90% similarity]
xml/xml-psi-impl/src/com/intellij/html/impl/util/MicrodataUtil.java

index 1872f4df7594fc1b97c3c56eaaf82592b31bc90d..d7962d648bb49808524d0a47becbac6438727d5d 100644 (file)
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="Eclipse">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/ecj-4.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/ecj-4.4.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
index 39b95bf19b90af187ae809237520314e33cda610..ebdc9a2155005e3144c36c5632540d12323930e1 100755 (executable)
@@ -59,6 +59,8 @@ IDE_BIN_HOME=`dirname "$SCRIPT_LOCATION"`
 # ---------------------------------------------------------------------
 if [ -n "$@@product_uc@@_JDK" -a -x "$@@product_uc@@_JDK/bin/java" ]; then
   JDK="$@@product_uc@@_JDK"
+elif [ -s "$HOME/.@@system_selector@@/config/@@vm_options@@.jdk" ]; then
+  JDK=`$CAT $HOME/.@@system_selector@@/config/@@vm_options@@.jdk`
 elif [ -x "$IDE_HOME/jre/jre/bin/java" ] && "$IDE_HOME/jre/jre/bin/java" -version > /dev/null 2>&1 ; then
   JDK="$IDE_HOME/jre"
 elif [ -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then
index 9d08eb89f5fa2905589f5dd7645ed8c014ff80f0..16de2c7f08ae5786ad4e08f8dda24f8f4cb2caeb 100644 (file)
@@ -200,8 +200,8 @@ libraryLicense(name: "fxg-utils", libraryName: "fxg-utils", version: "4.9.1", li
 libraryLicense(name: "Gant", version: "1.9.8", libraryName: "gant-1.9.11_groovy-2.3.0.jar", license: "Apache 2.0", url: "http://gant.codehaus.org/", licenseUrl: "http://gant.codehaus.org/Licence")
 libraryLicense(name: "Gherkin", libraryName: "Gherkin", version: "2.12.2", license: "MIT", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://github.com/cucumber/gherkin")
 libraryLicense(name: "Google Feedback", libraryName: "GoogleFeedback.jar", version: "", license: "TBD")
-libraryLicense(name: "gradle-tooling-api-2.5.jar", version: "2.5", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
-libraryLicense(name: "Gradle", version: "1.12", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
+libraryLicense(name: "gradle-tooling-api-2.9.jar", version: "2.9", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
+libraryLicense(name: "Gradle", version: "2.9", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
 libraryLicense(name: "GradleGuava", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "GradleJnaPosix", version: "1.0.3", license: "LGPL 2.1", url: "http://www.jruby.org/", licenseUrl: "http://www.gnu.org/licenses/lgpl-2.1.txt")
 libraryLicense(name: "Groovy", version: "2.3.9", license: "Apache 2.0", url: "http://groovy.codehaus.org/")
index 79d538dd3c442c06141c22de3ad1c2de19f83888..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() })
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..a560573afb51db52968ec745ad1eba15cdb08cb7 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" />
-      </value>
-    </option>
-    <option name="JS.SEMICOLON">
-      <value />
-    </option>
-    <option name="JS.STATIC_MEMBER_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="CCCC33" />
       </value>
     </option>
-    <option name="JS.STATIC_MEMBER_VARIABLE">
+    <option name="LABEL">
       <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" />
+        <option name="FOREGROUND" value="66CC33" />
       </value>
     </option>
-    <option name="PHP_NUMBER">
+    <option baseAttributes="TEXT" name="PARAMETER_ATTRIBUTES" />
+    <option name="PHP_PARAMETER">
       <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="FONT_TYPE" value="2" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_LOCAL_VARIABLE" name="PHP_VAR" />
+    <option baseAttributes="CLASS_REFERENCE" name="PROTOCOL_REFERENCE" />
     <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" />
-      </value>
-    </option>
-    <option name="REGEXP.COMMA">
-      <value />
-    </option>
-    <option name="REGEXP.COMMENT">
-      <value>
-        <option name="FOREGROUND" value="9933cc" />
+        <option name="FOREGROUND" value="3387CC" />
       </value>
     </option>
-    <option name="REGEXP.ESC_CHARACTER">
+    <option name="REST.BOLD">
       <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..19cfa30304951b0e343cb877c88d6a9e6c256289 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" />
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
+      </value>
+    </option>
+    <option baseAttributes="DEFAULT_KEYWORD" name="COFFEESCRIPT.THIS" />
+    <option name="CONDITIONALLY_NOT_COMPILED">
+      <value>
+        <option name="FOREGROUND" value="AEAEAE" />
       </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>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="8da6ce" />
+        <option name="FOREGROUND" value="8DA6CE" />
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="8da6ce" />
+        <option name="FOREGROUND" value="8DA6CE" />
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
+    <option baseAttributes="HTML_ATTRIBUTE_VALUE" name="CSS.URL" />
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="68e868" />
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="Clojure Atom">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="Clojure Character">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
+    <option baseAttributes="RUBY_IDENTIFIER" name="Clojure Keyword" />
     <option name="Clojure Line comment">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_INSTANCE_FIELD" name="Clojure Literal" />
     <option name="Clojure Numbers">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="Clojure Strings">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="DEFAULT_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="DEFAULT_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="DEFAULT_BRACES" />
+    <option baseAttributes="TEXT" name="DEFAULT_BRACKETS" />
     <option name="DEFAULT_CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="DEFAULT_COMMA" />
     <option name="DEFAULT_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT_TAG">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
     <option name="DEFAULT_DOC_MARKUP">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="DEFAULT_DOT" />
     <option name="DEFAULT_ENTITY">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_CALL">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="DEFAULT_GLOBAL_VARIABLE">
     </option>
     <option name="DEFAULT_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
-    <option name="DEFAULT_INSTANCE_FIELD" baseAttributes="DEFAULT_IDENTIFIER" />
+    <option baseAttributes="DEFAULT_LOCAL_VARIABLE" name="DEFAULT_INSTANCE_FIELD" />
     <option name="DEFAULT_INSTANCE_METHOD">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="DEFAULT_INTERFACE_NAME">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="DEFAULT_INVALID_STRING_ESCAPE" />
     <option name="DEFAULT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="DEFAULT_LABEL">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="DEFAULT_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_LOCAL_VARIABLE" />
     <option name="DEFAULT_METADATA">
       <value>
-        <option name="FOREGROUND" value="7f90aa" />
+        <option name="FOREGROUND" value="7F90AA" />
       </value>
     </option>
     <option name="DEFAULT_NUMBER">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="DEFAULT_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_IDENTIFIER" name="DEFAULT_PARAMETER" />
+    <option baseAttributes="TEXT" name="DEFAULT_PARENTHS" />
     <option name="DEFAULT_PREDEFINED_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="8da6ce" />
+        <option name="FOREGROUND" value="8DA6CE" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="DEFAULT_SEMICOLON" />
     <option name="DEFAULT_STATIC_FIELD">
       <value>
         <option name="FONT_TYPE" value="2" />
     </option>
     <option name="DEFAULT_STATIC_METHOD">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="DEFAULT_STRING">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
-    <option name="DEFAULT_TAG">
-      <value />
-    </option>
-    <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR">
-      <value />
-    </option>
+    <option baseAttributes="TEXT" name="DEFAULT_TAG" />
+    <option baseAttributes="TEXT" name="DEFAULT_TEMPLATE_LANGUAGE_COLOR" />
     <option name="DEFAULT_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </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="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="8da6ce" />
+        <option name="FOREGROUND" value="8DA6CE" />
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="7f90aa" />
+        <option name="FOREGROUND" value="7F90AA" />
       </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="D8FA3C" />
+      </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="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
+    <option baseAttributes="GHERKIN_TEXT" name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION" />
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
+    <option baseAttributes="GHERKIN_TEXT" name="GHERKIN_TABLE_CELL" />
+    <option baseAttributes="GHERKIN_TEXT" name="GHERKIN_TABLE_HEADER_CELL" />
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="GHERKIN_TEXT" />
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
+    <option baseAttributes="HAML_TEXT" name="HAML_FILTER" />
+    <option baseAttributes="HAML_TEXT" name="HAML_FILTER_CONTENT" />
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
+    <option baseAttributes="HAML_TEXT" name="HAML_LINE_CONTINUATION" />
+    <option baseAttributes="DEFAULT_PARENTHS" name="HAML_PARENTHS" />
+    <option baseAttributes="HAML_TEXT" name="HAML_RUBY_CODE" />
+    <option baseAttributes="HAML_TEXT" name="HAML_RUBY_START" />
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
+    <option baseAttributes="HAML_TEXT" name="HAML_TAG" />
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="7f90aa" />
+        <option name="FOREGROUND" value="7F90AA" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="HAML_TEXT" />
+    <option baseAttributes="HAML_TEXT" name="HAML_WS_REMOVAL" />
+    <option baseAttributes="HAML_TEXT" name="HAML_XHTML" />
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
+    <option baseAttributes="XML_TAG" name="HTML_TAG" />
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="7f90aa" />
+        <option name="FOREGROUND" value="7F90AA" />
       </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="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="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </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="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </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="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="JAVA_PARENTH" />
+    <option baseAttributes="TEXT" name="JAVA_SEMICOLON" />
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
         <option name="BACKGROUND" value="423535" />
       </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 baseAttributes="TEXT" name="JS.PARAMETER" />
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
-    <option name="MATCHED_BRACE_ATTRIBUTES">
+    <option name="LABEL">
       <value>
-        <option name="BACKGROUND" value="3a6da0" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
-    <option name="NOT_USED_ELEMENT_ATTRIBUTES">
+    <option baseAttributes="TEXT" name="LESS_INJECTED_CODE" />
+    <option baseAttributes="TEXT" name="LESS_JS_CODE_DELIM" />
+    <option baseAttributes="TEXT" name="LESS_VARIABLE" />
+    <option baseAttributes="TEXT" name="LOCAL_VARIABLE_ATTRIBUTES" />
+    <option name="MACRONAME">
       <value>
-        <option name="FOREGROUND" value="80807f" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
-    <option name="OC.BLOCK_COMMENT">
+    <option baseAttributes="TEXT" name="MACRO_PARAMETER" />
+    <option name="MATCHED_BRACE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="BACKGROUND" value="3a6da0" />
       </value>
     </option>
-    <option name="OC.CLASS_REFERENCE">
+    <option name="MESSAGE_ARGUMENT">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
-    <option name="OC.CONDITIONALLY_NOT_COMPILED">
+    <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="80807f" />
       </value>
     </option>
-    <option name="OC.CPP_KEYWORD">
+    <option baseAttributes="TEXT" name="OC.BADCHARACTER" />
+    <option name="OC.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
-    <option name="OC.DIRECTIVE">
+    <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="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
-    <option name="OC.ENUM_CONST">
+    <option name="OC.DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="OC.DOT" />
+    <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.EXTERN_VARIABLE" />
     <option name="OC.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
-    <option name="OC.KEYWORD">
+    <option name="OC.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
-    <option name="OC.LABEL">
+    <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.GLOBAL_VARIABLE" />
+    <option name="OC.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="OC.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
-      </value>
-    </option>
-    <option name="OC.MACRONAME">
-      <value>
-        <option name="FOREGROUND" value="ff6400" />
-      </value>
-    </option>
-    <option name="OC.MESSAGE_ARGUMENT">
-      <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
+    <option baseAttributes="TEXT" name="OC.LOCAL_VARIABLE" />
     <option name="OC.NUMBER">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
-    <option name="OC.PROTOCOL_REFERENCE">
+    <option baseAttributes="OC.DOT" name="OC.OPERATION_SIGN" />
+    <option baseAttributes="TEXT" name="OC.PARAMETER" />
+    <option baseAttributes="OC.DOT" name="OC.PARENTHS" />
+    <option baseAttributes="IVAR" name="OC.PROPERTY" />
+    <option baseAttributes="OC.KEYWORD" name="OC.SELFSUPERTHIS" />
+    <option baseAttributes="OC.DOT" name="OC.SEMICOLON" />
+    <option name="OC.STRING">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
-    <option name="OC.STRING">
+    <option name="OC.STRUCT_FIELD">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
-    <option name="OC.STRUCT_FIELD">
+    <option name="OC_FORMAT_TOKEN">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
-    <option name="OC.TYPEDEF">
+    <option baseAttributes="TEXT" name="PARAMETER_ATTRIBUTES" />
+    <option baseAttributes="DEFAULT_PARAMETER" name="PHP_PARAMETER" />
+    <option baseAttributes="DEFAULT_LOCAL_VARIABLE" name="PHP_VAR" />
+    <option name="PROTOCOL_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
-    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
     <option name="PUPPET_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
     </option>
     <option name="PUPPET_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_BRACES" name="PUPPET_BRACES" />
+    <option baseAttributes="DEFAULT_BRACKETS" name="PUPPET_BRACKETS" />
     <option name="PUPPET_CLASS">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </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="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="PUPPET_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="PUPPET_NUMBER">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="PUPPET_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_PARENTHS" name="PUPPET_PARENTH" />
     <option name="PUPPET_REGEX">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </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="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="PUPPET_STRING">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_LOCAL_VARIABLE" name="PUPPET_VARIABLE" />
     <option name="PUPPET_VARIABLE_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </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="8da6ce" />
+        <option name="FOREGROUND" value="8DA6CE" />
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_COMMA" name="PY.COMMA" />
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_DOT" name="PY.DOT" />
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="ff6400" />
+        <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
+    <option baseAttributes="DEFAULT_INVALID_STRING_ESCAPE" name="PY.INVALID_STRING_ESCAPE" />
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="aeaeae" />
+        <option name="FOREGROUND" value="AEAEAE" />
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREGROUND" value="D8FA3C" />
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="fbde2d" />
+        <option name="FOREGROUND" value="FBDE2D" />
       </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="8da6ce" />
+        <option name="FOREGROUND" value="8DA6CE" />
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="61ce3c" />
+        <option name="FOREGROUND" value="61CE3C" />
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="d8fa3c" />
+        <option name="FOREG