From b8de1ceeca40f278f5376f191aa49834cadfe609 Mon Sep 17 00:00:00 2001 From: Septh Date: Wed, 29 Nov 2017 11:07:23 +0100 Subject: [PATCH] Release 1.2.5 --- CHANGELOG.md | 2 +- languages/grammars/wow-lua.tmLanguage | 18 ++- ..._icons.json => vs_minimal-icon-theme.json} | 0 themes/theme-defaults/package.json | 2 +- themes/theme-defaults/themes/dark_plus.json | 53 +++++++++ themes/theme-defaults/themes/dark_vs.json | 14 ++- .../themes/hc_black_defaults.json | 20 +++- themes/theme-defaults/themes/light_plus.json | 54 +++++++++ themes/theme-defaults/themes/light_vs.json | 11 +- .../themes/dimmed-monokai-color-theme.json | 103 ++++++++++-------- .../themes/monokai-color-theme.json | 49 +++++---- 11 files changed, 248 insertions(+), 78 deletions(-) rename themes/theme-defaults/fileicons/{vs_minimal_icons.json => vs_minimal-icon-theme.json} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e8620d..c1fbf27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## 1.2.5 -- [language.lua] Updated to match WoW 7.3.0 build 25021. +- [language.lua] Updated to (hopefully) match WoW 7.3.2 build 25549. - [language.lua] Added support for intendation rules to lua-language-configuration.json ## 1.2.4 diff --git a/languages/grammars/wow-lua.tmLanguage b/languages/grammars/wow-lua.tmLanguage index 5b41e09..c48e996 100644 --- a/languages/grammars/wow-lua.tmLanguage +++ b/languages/grammars/wow-lua.tmLanguage @@ -2526,7 +2526,7 @@ match - \b(AbbreviateNumbers|AchievementFrame_LoadUI|AchievementFrame_SelectAchievement|AchievementFrame_ToggleAchievementFrame|ActionButtonDown|ActionButtonUp|AddToAutoHide|AnimateTexCoords|BetterDate|BuildColoredListString|BuildListString|BuildMultilineTooltip|BuildNewLineListString|ButtonInventorySlot|ButtonPulse_StopPulse|CRFFlowFilterFunc|CRFGroupFilterFunc|C_Timer\.(NewTicker|NewTimer)|CallRestrictedClosure|CanCreateFilters|CanGroupInvite|CanOpenPanels|CanShowCenterUIPanel|CanShowRightUIPanel|CanShowUIPanels|CapProgressBar_SetNotches|CapProgressBar_Update|ChatChannelPasswordHandler|ChatEdit_GetActiveWindow|ChatEdit_InsertLink|ChatFrame_AddChannel|ChatFrame_AddMessageEventFilter|ChatFrame_GetMessageEventFilter|ChatFrame_RemoveMessageEventFilter|Clamp|ClampUIPanelY|ClampedPercentageBetween|ClearClampedTextureRotation|CloseAllBags|CloseAllWindows|CloseAllWindows_WithExceptions|CloseBackpack|CloseBag|CloseBankBagFrames|CloseChildWindows|CloseDropDownMenus|CloseMenus|CloseSpecialWindows|CloseWindows|ComboPointShineFadeIn|ComboPointShineFadeOut|ComputePetBonus|ConsolePrint|ControlSetValue|CopyTable|CreateAtlasMarkup|CreateChatChannelList|CreateColor|CreateFromMixins|CreateRectangle|CreateTextureMarkup|DecodeResolution|DeltaLerp|DrawOneHopLines|DressUpItemLink|DressUpTexturePath|EasyMenu|EncounterJournal_OpenJournal|FCF_GetChatWindowInfo|FauxScrollFrame_GetOffset|FauxScrollFrame_SetOffset|FauxScrollFrame_Update|FindInTableIf|FormatLargeNumber|FormatPercentage|FormatProfession|FormatShortDate|FrameDeltaLerp|GetAchievementInfoFromHyperlink|GMError|GetBindingFromClick|GetBindingName|GetChatUnitColor|GetClassColor|GetColoredName|GetDenominationsFromCopper|GetDungeonNameWithDifficulty|GetEnemyDodgeChance|GetEnemyParryChance|GetEquipmentSetIconInfo|GetFixedLink|GetFrameHandle|GetFrameHandleFrame|GetFullRaidList|GetItemInfoFromHyperlink|GetLFGMode|GetLowBit|GetManagedEnvironment|GetMaterialTextColors|GetMessageTypeColor|GetMessageTypeState|GetMoneyString|GetNumWatchedTokens|GetQuestDifficultyColor|GetRandomArgument|GetReadonlyRestrictedTable|GetScreenHeightScale|GetScreenWidthScale|GetSpellNameColor|GetTableColor|GetTexCoordsByGrid|GetTexCoordsForRole|GetTexCoordsForRoleSmall|GetTexCoordsForRoleSmallCircle|GetTimerTextColor|GetUIPanel|GetUIPanelHeight|GetUIPanelWidth|GetUIPanelWindowInfo|GetUnitName|HandleModifiedItemClick|HasMessageType|HasMessageTypeGroup|HasMultiCastActionBar|HasMultiCastActionPage|HelpReportLag|HideDropDownMenu|HideMultiCastActionBar|HideParentPanel|HidePartyFrame|HidePetActionBar|HideUIPanel|HideWatchedReputationBarText|HybridScrollFrame_CollapseButton|HybridScrollFrame_CreateButtons|HybridScrollFrame_ExpandButton|HybridScrollFrame_GetOffset|HybridScrollFrame_SetOffset|HybridScrollFrame_Update|InGlue|InboxGetMoreMail|InboxNextPage|InboxPrevPage|InspectAchievements|InspectUnit|InterfaceOptionsFrame_OpenToCategory|InterfaceOptions_AddCategory|IsBagOpen|IsCombatLog|IsFrameHandle|IsListeningForMessageType|IsMessageDoneBy|IsMessageDoneTo|IsOptionFrameOpen|IsSecureCmd|IsWritableRestrictedTable|LFDGetNumDungeons|LFGDebug|LFGGetDungeonInfoByID|LFGIsIDHeader|LFGListFilterChoices|LFGListRemoveCollapsedChildren|LFGListRemoveHeadersWithoutChildren|LFGListUpdateHeaderEnabledAndLockedStates|LFRGetNumDungeons|Lerp|LowerFrameLevel|MicroButtonPulse|MicroButtonPulseStop|MiniMapTrackingShineFadeIn|MiniMapTrackingShineFadeOut|Mixin|MoneyFrame_Update|MouseIsOver|MultiActionButtonDown|MultiActionButtonUp|MultiCastActionButtonDown|MultiCastActionButtonUp|MultiCastRecallSpellButtonUp|MultiCastSummonSpellButtonUp|OpenAllBags|OpenBackpack|OpenBag|OpenCoinPickupFrame|OpenColorPicker|OpenGlyphFrame|OpenStackSplitFrame|PanelTemplates_DeselectTab|PanelTemplates_DisableTab|PanelTemplates_EnableTab|PanelTemplates_GetSelectedTab|PanelTemplates_GetTabWidth|PanelTemplates_SelectTab|PanelTemplates_SetDisabledTabState|PanelTemplates_SetNumTabs|PanelTemplates_SetTab|PanelTemplates_TabResize|PanelTemplates_UpdateTabs|PartyMemberHealthCheck|PassClickToParent|PercentageBetween|QueryCastSequence|QuestLog_OpenToQuest|QuestLog_Update|QuestPOI_HideAllButtons|RaiseFrameLevel|RaiseFrameLevelByTwo|RealPartyIsFull|RecentTimeDate|RefreshAuras|RefreshBuffs|RefreshDebuffs|RefreshMoneyFrame|RegisterAttributeDriver|RegisterAutoHide|RegisterStateDriver|RegisterUnitWatch|Round|Saturate|SecondsToTime|SecondsToTimeAbbrev|SecureCmdItemParse|SecureCmdUseItem|SecureHandlerExecute|SecureHandlerSetFrameRef|SecureHandlerUnwrapScript|SecureHandlerWrapScript|SetButtonPulse|SetCheckButtonIsRadio|SetClampedTextureRotation|SetDressUpBackground|SetGuildTabardTextures|SetItemButtonCount|SetItemButtonDesaturated|SetItemButtonNameFrameVertexColor|SetItemButtonNormalTextureVertexColor|SetItemButtonQuality|SetItemButtonSlotVertexColor|SetItemButtonStock|SetItemButtonTexture|SetItemButtonTextureVertexColor|SetItemRef|SetLargeGuildTabardTextures|SetMoneyFrameColor|SetRaidTargetIcon|SetSelfMuteState|SetTextStatusBarText|SetTextStatusBarTextPrefix|SetTextStatusBarTextZeroText|SetTitleByName|SetUIPanelAttribute|SetUpAnimation|SetZoneText|ShowBonusActionBar|ShowGarrisonLandingPage|ShowInspectCursor|ShowMacroFrame|ShowNumericThreat|ShowPartyFrame|ShowPetActionBar|ShowQuickButton|ShowReadyCheck|ShowResurrectRequest|ShowTextStatusBarText|ShowUIPanel|ShowWatchedReputationBarText|ShowWhoPanel|Social_InsertLink|SquareButton_SetIcon|StaticPopup_Hide|StaticPopup_Show|TargetHealthCheck|TargetofTargetHealthCheck|ToggleAchievementFrame|ToggleBackpack|ToggleBag|ToggleBattlefieldMinimap|ToggleCalendar|ToggleCharacter|ToggleChatChannel|ToggleChatColorNamesByClassGroup|ToggleChatMessageGroup|ToggleDropDownMenu|ToggleFrame|ToggleFramerate|ToggleFriendsFrame|ToggleFriendsPanel|ToggleGameMenu|ToggleGuildFrame|ToggleHelpFrame|ToggleIgnorePanel|ToggleMinimap|TogglePVPUI|TogglePetTalentFrame|ToggleSpellBook|ToggleStats|ToggleTalentFrame|ToggleTimeManager|TriStateCheckbox_SetState|UIDropDownMenuButton_GetChecked|UIDropDownMenuButton_GetName|UIDropDownMenu_AddButton|UIDropDownMenu_AddSeparator|UIDropDownMenu_ClearAllCreateInfo|UIDropDownMenu_CreateInfo|UIDropDownMenu_DisableButton|UIDropDownMenu_DisableDropDown|UIDropDownMenu_EnableButton|UIDropDownMenu_EnableDropDown|UIDropDownMenu_GetCurrentDropDown|UIDropDownMenu_GetSelectedID|UIDropDownMenu_GetSelectedName|UIDropDownMenu_GetSelectedValue|UIDropDownMenu_GetText|UIDropDownMenu_GetValue|UIDropDownMenu_Initialize|UIDropDownMenu_IsEnabled|UIDropDownMenu_JustifyText|UIDropDownMenu_Refresh|UIDropDownMenu_SetAnchor|UIDropDownMenu_SetButtonText|UIDropDownMenu_SetButtonWidth|UIDropDownMenu_SetSelectedID|UIDropDownMenu_SetSelectedName|UIDropDownMenu_SetSelectedValue|UIDropDownMenu_SetText|UIDropDownMenu_SetWidth|UIFrameFade|UIFrameFadeIn|UIFrameFadeOut|UIFrameFadeRemoveFrame|UIFrameFlash|UIFrameFlashRemoveFrame|UIFrameFlashStop|UIFrameFlashSwitch|UIFrameIsFading|UIFrameIsFlashing|UIParentLoadAddOn|UnSilenceMember|UnitHasMana|UnitWatchRegistered|UnregisterAttributeDriver|UnregisterAutoHide|UnregisterStateDriver|UnregisterUnitWatch|UpdateMicroButtons|UpdateUIPanelPositions|UsesGUID|ValidateFramePosition|VideoOptionsValueChanged|VoiceChatShineFadeIn|VoiceChatShineFadeOut|WrapTextInColorCode|_ERRORMESSAGE|getglobal|getprinthandler|message|print|setglobal|setprinthandler|tContains|tDeleteItem|tInvert|tFilter|tostringall)\b + \b(AbbreviateNumbers|AchievementFrame_(?:LoadUI|SelectAchievement|ToggleAchievementFrame)|ActionButtonDown|ActionButtonUp|AddToAutoHide|AnimateTexCoords|BetterDate|BuildColoredListString|BuildListString|BuildMultilineTooltip|BuildNewLineListString|ButtonInventorySlot|ButtonPulse_StopPulse|CRFFlowFilterFunc|CRFGroupFilterFunc|C_Timer\.(NewTicker|NewTimer)|CallRestrictedClosure|CanCreateFilters|CanGroupInvite|CanOpenPanels|CanShowCenterUIPanel|CanShowRightUIPanel|CanShowUIPanels|CapProgressBar_SetNotches|CapProgressBar_Update|ChatChannelPasswordHandler|ChatEdit_GetActiveWindow|ChatEdit_InsertLink|ChatFrame_(?:AddChannel|AddMessageEventFilter|GetMessageEventFilter|RemoveMessageEventFilter)|Clamp|ClampUIPanelY|ClampedPercentageBetween|ClearClampedTextureRotation|CloseAllBags|CloseAllWindows|CloseAllWindows_WithExceptions|CloseBackpack|CloseBag|CloseBankBagFrames|CloseChildWindows|CloseDropDownMenus|CloseMenus|CloseSpecialWindows|CloseWindows|ComboPointShineFadeIn|ComboPointShineFadeOut|ComputePetBonus|ConsolePrint|ControlSetValue|CopyTable|CreateAtlasMarkup|CreateChatChannelList|CreateColor|CreateFromMixins|CreateRectangle|CreateTextureMarkup|DecodeResolution|DeltaLerp|DrawOneHopLines|DressUpItemLink|DressUpTexturePath|EasyMenu|EncounterJournal_OpenJournal|FCF_GetChatWindowInfo|FauxScrollFrame_GetOffset|FauxScrollFrame_SetOffset|FauxScrollFrame_Update|FindInTableIf|FormatLargeNumber|FormatPercentage|FormatProfession|FormatShortDate|FrameDeltaLerp|GetAchievementInfoFromHyperlink|GMError|GetBindingFromClick|GetBindingName|GetChatUnitColor|GetClassColor|GetColoredName|GetDenominationsFromCopper|GetDungeonNameWithDifficulty|GetEnemyDodgeChance|GetEnemyParryChance|GetEquipmentSetIconInfo|GetFixedLink|GetFrameHandle|GetFrameHandleFrame|GetFullRaidList|GetItemInfoFromHyperlink|GetLFGMode|GetLowBit|GetManagedEnvironment|GetMaterialTextColors|GetMessageTypeColor|GetMessageTypeState|GetMoneyString|GetNumWatchedTokens|GetQuestDifficultyColor|GetRandomArgument|GetReadonlyRestrictedTable|GetScreenHeightScale|GetScreenWidthScale|GetSpellNameColor|GetTableColor|GetTexCoordsByGrid|GetTexCoordsForRole|GetTexCoordsForRoleSmall|GetTexCoordsForRoleSmallCircle|GetTimerTextColor|GetUIPanel|GetUIPanelHeight|GetUIPanelWidth|GetUIPanelWindowInfo|GetUnitName|HandleModifiedItemClick|HasMessageType|HasMessageTypeGroup|HasMultiCastActionBar|HasMultiCastActionPage|HelpReportLag|HideDropDownMenu|HideMultiCastActionBar|HideParentPanel|HidePartyFrame|HidePetActionBar|HideUIPanel|HideWatchedReputationBarText|HybridScrollFrame_CollapseButton|HybridScrollFrame_CreateButtons|HybridScrollFrame_ExpandButton|HybridScrollFrame_GetOffset|HybridScrollFrame_SetOffset|HybridScrollFrame_Update|InGlue|InboxGetMoreMail|InboxNextPage|InboxPrevPage|InspectAchievements|InspectUnit|InterfaceOptionsFrame_OpenToCategory|InterfaceOptions_AddCategory|IsBagOpen|IsCombatLog|IsFrameHandle|IsListeningForMessageType|IsMessageDoneBy|IsMessageDoneTo|IsOptionFrameOpen|IsSecureCmd|IsWritableRestrictedTable|LFDGetNumDungeons|LFGDebug|LFGGetDungeonInfoByID|LFGIsIDHeader|LFGListFilterChoices|LFGListRemoveCollapsedChildren|LFGListRemoveHeadersWithoutChildren|LFGListUpdateHeaderEnabledAndLockedStates|LFRGetNumDungeons|Lerp|LowerFrameLevel|MicroButtonPulse|MicroButtonPulseStop|MiniMapTrackingShineFadeIn|MiniMapTrackingShineFadeOut|Mixin|MoneyFrame_Update|MouseIsOver|MultiActionButtonDown|MultiActionButtonUp|MultiCastActionButtonDown|MultiCastActionButtonUp|MultiCastRecallSpellButtonUp|MultiCastSummonSpellButtonUp|OpenAllBags|OpenBackpack|OpenBag|OpenCoinPickupFrame|OpenColorPicker|OpenGlyphFrame|OpenStackSplitFrame|PanelTemplates_DeselectTab|PanelTemplates_DisableTab|PanelTemplates_EnableTab|PanelTemplates_GetSelectedTab|PanelTemplates_GetTabWidth|PanelTemplates_SelectTab|PanelTemplates_SetDisabledTabState|PanelTemplates_SetNumTabs|PanelTemplates_SetTab|PanelTemplates_TabResize|PanelTemplates_UpdateTabs|PartyMemberHealthCheck|PassClickToParent|PercentageBetween|QueryCastSequence|QuestLog_OpenToQuest|QuestLog_Update|QuestPOI_HideAllButtons|RaiseFrameLevel|RaiseFrameLevelByTwo|RealPartyIsFull|RecentTimeDate|RefreshAuras|RefreshBuffs|RefreshDebuffs|RefreshMoneyFrame|RegisterAttributeDriver|RegisterAutoHide|RegisterStateDriver|RegisterUnitWatch|Round|Saturate|SecondsToTime|SecondsToTimeAbbrev|SecureCmdItemParse|SecureCmdUseItem|SecureHandlerExecute|SecureHandlerSetFrameRef|SecureHandlerUnwrapScript|SecureHandlerWrapScript|SetButtonPulse|SetCheckButtonIsRadio|SetClampedTextureRotation|SetDressUpBackground|SetGuildTabardTextures|SetItemButtonCount|SetItemButtonDesaturated|SetItemButtonNameFrameVertexColor|SetItemButtonNormalTextureVertexColor|SetItemButtonQuality|SetItemButtonSlotVertexColor|SetItemButtonStock|SetItemButtonTexture|SetItemButtonTextureVertexColor|SetItemRef|SetLargeGuildTabardTextures|SetMoneyFrameColor|SetRaidTargetIcon|SetSelfMuteState|SetTextStatusBarText|SetTextStatusBarTextPrefix|SetTextStatusBarTextZeroText|SetTitleByName|SetUIPanelAttribute|SetUpAnimation|SetZoneText|ShowBonusActionBar|ShowGarrisonLandingPage|ShowInspectCursor|ShowMacroFrame|ShowNumericThreat|ShowPartyFrame|ShowPetActionBar|ShowQuickButton|ShowReadyCheck|ShowResurrectRequest|ShowTextStatusBarText|ShowUIPanel|ShowWatchedReputationBarText|ShowWhoPanel|Social_InsertLink|SquareButton_SetIcon|StaticPopup_Hide|StaticPopup_Show|TargetHealthCheck|TargetofTargetHealthCheck|ToggleAchievementFrame|ToggleBackpack|ToggleBag|ToggleBattlefieldMinimap|ToggleCalendar|ToggleCharacter|ToggleChatChannel|ToggleChatColorNamesByClassGroup|ToggleChatMessageGroup|ToggleDropDownMenu|ToggleFrame|ToggleFramerate|ToggleFriendsFrame|ToggleFriendsPanel|ToggleGameMenu|ToggleGuildFrame|ToggleHelpFrame|ToggleIgnorePanel|ToggleMinimap|TogglePVPUI|TogglePetTalentFrame|ToggleSpellBook|ToggleStats|ToggleTalentFrame|ToggleTimeManager|TriStateCheckbox_SetState|UIDropDownMenuButton_GetChecked|UIDropDownMenuButton_GetName|UIDropDownMenu_AddButton|UIDropDownMenu_AddSeparator|UIDropDownMenu_ClearAllCreateInfo|UIDropDownMenu_CreateInfo|UIDropDownMenu_DisableButton|UIDropDownMenu_DisableDropDown|UIDropDownMenu_EnableButton|UIDropDownMenu_EnableDropDown|UIDropDownMenu_GetCurrentDropDown|UIDropDownMenu_GetSelectedID|UIDropDownMenu_GetSelectedName|UIDropDownMenu_GetSelectedValue|UIDropDownMenu_GetText|UIDropDownMenu_GetValue|UIDropDownMenu_Initialize|UIDropDownMenu_IsEnabled|UIDropDownMenu_JustifyText|UIDropDownMenu_Refresh|UIDropDownMenu_SetAnchor|UIDropDownMenu_SetButtonText|UIDropDownMenu_SetButtonWidth|UIDropDownMenu_SetSelectedID|UIDropDownMenu_SetSelectedName|UIDropDownMenu_SetSelectedValue|UIDropDownMenu_SetText|UIDropDownMenu_SetWidth|UIFrameFade|UIFrameFadeIn|UIFrameFadeOut|UIFrameFadeRemoveFrame|UIFrameFlash|UIFrameFlashRemoveFrame|UIFrameFlashStop|UIFrameFlashSwitch|UIFrameIsFading|UIFrameIsFlashing|UIParentLoadAddOn|UnSilenceMember|UnitHasMana|UnitWatchRegistered|UnregisterAttributeDriver|UnregisterAutoHide|UnregisterStateDriver|UnregisterUnitWatch|UpdateMicroButtons|UpdateUIPanelPositions|UsesGUID|ValidateFramePosition|VideoOptionsValueChanged|VoiceChatShineFadeIn|VoiceChatShineFadeOut|WrapTextInColorCode|_ERRORMESSAGE|getglobal|getprinthandler|message|print|setglobal|setprinthandler|tContains|tDeleteItem|tInvert|tFilter|tostringall)\b name support.function.wow-library.lua @@ -2534,7 +2534,13 @@ match - \b(AchievementFrame|ArcheologyDigsiteProgressBar|ArtifactFrame|BankFrame|ChatFrameEditBox|CollectionsJournal|CompactRaidFrameManager|FriendsFrame|GameFontBlack|GameFontBlackMedium|GameFontBlackSmall|GameFontBlackSmall2|GameFontBlackTiny|GameFontBlackTiny2|GameFontDisable|GameFontDisableHuge|GameFontDisableLarge|GameFontDisableSmall|GameFontDisableSmall2|GameFontDisableSmallLeft|GameFontDisableTiny|GameFontDisableTiny2|GameFontGreen|GameFontHighlight|GameFontHighlightHuge|GameFontHighlightLarge|GameFontHighlightMed2|GameFontHighlightMedium|GameFontHighlightOutline|GameFontHighlightSmall|GameFontHighlightSmall2|GameFontHighlightSmallLeft|GameFontNormal|GameFontNormalHuge|GameFontNormalHuge2|GameFontNormalHuge3|GameFontNormalHuge3Outline|GameFontNormalHugeOutline|GameFontNormalHugeOutline2|GameFontNormalLarge|GameFontNormalLarge2|GameFontNormalLargeOutline|GameFontNormalMed1|GameFontNormalMed2|GameFontNormalMed3|GameFontNormalOutline|GameFontNormalShadowHuge2|GameFontNormalSmall|GameFontNormalSmall2|GameFontNormalTiny|GameFontNormalTiny2|GameFontNormalWTF2|GameFontNormalWTF2Outline|GameFontRed|GameFontRedLarge|GameFontWhiteTiny|GameFontWhiteTiny2|GameTooltip|GameTooltipHeaderText|GameTooltipText|GameTooltipTextSmall|GarrisonLandingPage|HelpFrame|LootHistoryFrame|MacroFrame|MailFrame|MerchantFrame|MessageFrame|Minimap|MinimapCluster|MovieFrame|OrderHallCommandBar|PlayerArrowEffectFrame|QuestFontHighlight|QuestLogFrame|QuestLogScrollFrame|RaidFrame|SocialPostFrame|SpellBookFrame|TalentFrame|TaxiRouteFrame|TradeSkillFrame|UIChildWindows|UIErrorsFrame|UIFrameCache|UIMenus|UIPanelWindows|UIParent|UISpecialFrames|WhoFrameEditBox|WhoFrameWhoButton|WorldFrame|WorldMapFrame)\b + \b(GameFontBlack(?:Medium|Small2?|Tiny2?)?|GameFontDisable|GameFontDisableHuge|GameFontDisableLarge|GameFontDisableSmall|GameFontDisableSmall2|GameFontDisableSmallLeft|GameFontDisableTiny|GameFontDisableTiny2|GameFontGreen|GameFontHighlight|GameFontHighlightHuge|GameFontHighlightLarge|GameFontHighlightMed2|GameFontHighlightMedium|GameFontHighlightOutline|GameFontHighlightSmall|GameFontHighlightSmall2|GameFontHighlightSmallLeft|GameFontNormal|GameFontNormalHuge|GameFontNormalHuge2|GameFontNormalHuge3|GameFontNormalHuge3Outline|GameFontNormalHugeOutline|GameFontNormalHugeOutline2|GameFontNormalLarge|GameFontNormalLarge2|GameFontNormalLargeOutline|GameFontNormalMed1|GameFontNormalMed2|GameFontNormalMed3|GameFontNormalOutline|GameFontNormalShadowHuge2|GameFontNormalSmall|GameFontNormalSmall2|GameFontNormalTiny|GameFontNormalTiny2|GameFontNormalWTF2|GameFontNormalWTF2Outline|GameFontRed|GameFontRedLarge|GameFontWhiteTiny|GameFontWhiteTiny2|GameTooltip|GameTooltipHeaderText|GameTooltipText|GameTooltipTextSmall|QuestFontHighlight|UIChildWindows|UIErrorsFrame|UIFrameCache|UIMenus|UIPanelWindows|UIParent|UISpecialFrames)\b + name + support.variable.object.wow-library.lua + + + match + \b(AchievementFrame|ArtifactFrame|AudioOptionsFrame|BankFrame|ChallengesKeystoneFrame|CharacterFrame|ChatConfigFrame|ChatFrame(?:10?|[2-9])|CinematicFrame|CollectionsJournal|CompactRaidFrameManager|ContainerFrame(?:1[0123]?|[2-9])|DeathRecapFrame|DressUpFrame|EncounterJournal|FriendsFrame|GameMenuFrame|GarrisonBuildingFrame|GarrisonLandingPage|GarrisonMissionFrame|GarrisonMonumentFrame|GarrisonRecruitSelectFrame|GarrisonRecruiterFrame|GarrisonShipyardFrame|GossipFrame|GuildRegistrarFrame|HelpFrame|GhostFrame|InterfaceOptionsFrame|ItemTextFrame|LootFrame|LootHistoryFrame|MacroFrame|MailFrame|MerchantFrame|MessageFrame|Minimap|MinimapCluster|MovieFrame|OrderHallCommandBar|OrderHallMissionFrame|OrderHallTalentFrame|PVEFrame|PVPBannerFrame|PVPUIFrame|PetStableFrame|PetitionFrame|QuestChoiceFrame|QuestFrame|QuestLogFrame|QuestLogPopupDetailFrame|RaidBrowserFrame|RaidFrame|RaidParentFrame|SocialPostFrame|SpellBookFrame|TabardFrame|TalentFrame|TaxiFrame|TradeFrame|TradeSkillFrame|VideoOptionsFrame|WardrobeFrame|WhoFrame|WorldFrame|WorldMapFrame|WorldStateScoreFrame)\b name support.variable.object.wow-library.lua @@ -2577,7 +2583,7 @@ repository - + wow-string-parameters patterns @@ -2599,7 +2605,7 @@ - + wow-widget-handlers match @@ -2608,7 +2614,7 @@ support.constant.script-handler.wow-api.lua - + wow-event-names patterns @@ -2740,7 +2746,7 @@ wow-event-names-C match - (['"])(CALENDAR_ACTION_PENDING|CALENDAR_CLOSE_EVENT|CALENDAR_EVENT_ALARM|CALENDAR_NEW_EVENT|CALENDAR_OPEN_EVENT|CALENDAR_UPDATE_ERROR|CALENDAR_UPDATE_EVENT|CALENDAR_UPDATE_EVENT_LIST|CALENDAR_UPDATE_GUILD_EVENTS|CALENDAR_UPDATE_INVITE_LIST|CALENDAR_UPDATE_PENDING_INVITES|CANCEL_GLYPH_CAST|CANCEL_LOOT_ROLL|CANCEL_SUMMON|CHALLENGE_MODE_COMPLETED|CHALLENGE_MODE_DEATH_COUNT_UPDATED|CHALLENGE_MODE_KEYSTONE_RECEPTABLE_OPEN|CHALLENGE_MODE_KEYSTONE_SLOTTED|CHALLENGE_MODE_LEADERS_UPDATE|CHALLENGE_MODE_MAPS_UPDATE|CHALLENGE_MODE_NEW_RECORD|CHALLENGE_MODE_RESET|CHALLENGE_MODE_START|CHANNEL_COUNT_UPDATE|CHANNEL_FLAGS_UPDATED|CHANNEL_INVITE_REQUEST|CHANNEL_PASSWORD_REQUEST|CHANNEL_ROSTER_UPDATE|CHANNEL_UI_UPDATE|CHANNEL_VOICE_UPDATE|CHARACTER_ITEM_FIXUP_NOTIFICATION|CHARACTER_POINTS_CHANGED|CHARACTER_UPGRADE_SPELL_TIER_SET|CHAT_COMBAT_MSG_ARENA_POINTS_GAIN|CHAT_MSG_ACHIEVEMENT|CHAT_MSG_ADDON|CHAT_MSG_AFK|CHAT_MSG_BG_SYSTEM_ALLIANCE|CHAT_MSG_BG_SYSTEM_HORDE|CHAT_MSG_BG_SYSTEM_NEUTRAL|CHAT_MSG_BN_INLINE_TOAST_ALERT|CHAT_MSG_BN_INLINE_TOAST_BROADCAST|CHAT_MSG_BN_INLINE_TOAST_BROADCAST_INFORM|CHAT_MSG_BN_INLINE_TOAST_CONVERSATION|CHAT_MSG_BN_WHISPER|CHAT_MSG_BN_WHISPER_INFORM|CHAT_MSG_BN_WHISPER_PLAYER_OFFLINE|CHAT_MSG_CHANNEL|CHAT_MSG_CHANNEL_JOIN|CHAT_MSG_CHANNEL_LEAVE|CHAT_MSG_CHANNEL_LIST|CHAT_MSG_CHANNEL_NOTICE|CHAT_MSG_CHANNEL_NOTICE_USER|CHAT_MSG_COMBAT_FACTION_CHANGE|CHAT_MSG_COMBAT_HONOR_GAIN|CHAT_MSG_COMBAT_MISC_INFO|CHAT_MSG_COMBAT_XP_GAIN|CHAT_MSG_CURRENCY|CHAT_MSG_DND|CHAT_MSG_EMOTE|CHAT_MSG_FILTERED|CHAT_MSG_GUILD|CHAT_MSG_GUILD_ACHIEVEMENT|CHAT_MSG_GUILD_ITEM_LOOTED|CHAT_MSG_IGNORED|CHAT_MSG_INSTANCE_CHAT|CHAT_MSG_INSTANCE_CHAT_LEADER|CHAT_MSG_LOOT|CHAT_MSG_MONEY|CHAT_MSG_MONSTER_EMOTE|CHAT_MSG_MONSTER_PARTY|CHAT_MSG_MONSTER_SAY|CHAT_MSG_MONSTER_WHISPER|CHAT_MSG_MONSTER_YELL|CHAT_MSG_OFFICER|CHAT_MSG_OPENING|CHAT_MSG_PARTY|CHAT_MSG_PARTY_LEADER|CHAT_MSG_PET_BATTLE_COMBAT_LOG|CHAT_MSG_PET_BATTLE_INFO|CHAT_MSG_PET_INFO|CHAT_MSG_RAID|CHAT_MSG_RAID_BOSS_EMOTE|CHAT_MSG_RAID_BOSS_WHISPER|CHAT_MSG_RAID_LEADER|CHAT_MSG_RAID_WARNING|CHAT_MSG_RESTRICTED|CHAT_MSG_SAY|CHAT_MSG_SKILL|CHAT_MSG_SYSTEM|CHAT_MSG_TARGETICONS|CHAT_MSG_TEXT_EMOTE|CHAT_MSG_TRADESKILLS|CHAT_MSG_WHISPER|CHAT_MSG_WHISPER_INFORM|CHAT_MSG_YELL|CHAT_SERVER_DISCONNECTED|CHAT_SERVER_RECONNECTED|CINEMATIC_START|CINEMATIC_STOP|CLEAR_BOSS_EMOTES|CLOSE_INBOX_ITEM|CLOSE_TABARD_FRAME|CLOSE_WORLD_MAP|COMBAT_LOG_EVENT|COMBAT_LOG_EVENT_UNFILTERED|COMBAT_RATING_UPDATE|COMBAT_TEXT_UPDATE|COMMENTATOR_ENTER_WORLD|COMMENTATOR_MAP_UPDATE|COMMENTATOR_PARTY_INFO_REQUEST|COMMENTATOR_PLAYER_NAME_OVERRIDE_UPDATE|COMMENTATOR_PLAYER_UPDATE|COMPACT_UNIT_FRAME_PROFILES_LOADED|COMPANION_LEARNED|COMPANION_UNLEARNED|COMPANION_UPDATE|CONFIRM_BEFORE_USE|CONFIRM_BINDER|CONFIRM_DISENCHANT_ROLL|CONFIRM_LOOT_ROLL|CONFIRM_SUMMON|CONFIRM_TALENT_WIPE|CONFIRM_XP_LOSS|CONTRIBUTION_COLLECTOR_CLOSE|CONTRIBUTION_COLLECTOR_OPEN|CONTRIBUTION_COLLECTOR_PENDING|CONTRIBUTION_COLLECTOR_UPDATE|CONTRIBUTION_COLLECTOR_UPDATE_SINGLE|CORPSE_IN_INSTANCE|CORPSE_IN_RANGE|CORPSE_OUT_OF_RANGE|CRITERIA_COMPLETE|CRITERIA_EARNED|CRITERIA_UPDATE|CURRENCY_DISPLAY_UPDATE|CURRENT_SPELL_CAST_CHANGED|CURSOR_UPDATE|CVAR_UPDATE)\1 + (['"])(CALENDAR_ACTION_PENDING|CALENDAR_CLOSE_EVENT|CALENDAR_EVENT_ALARM|CALENDAR_NEW_EVENT|CALENDAR_OPEN_EVENT|CALENDAR_UPDATE_ERROR|CALENDAR_UPDATE_EVENT|CALENDAR_UPDATE_EVENT_LIST|CALENDAR_UPDATE_GUILD_EVENTS|CALENDAR_UPDATE_INVITE_LIST|CALENDAR_UPDATE_PENDING_INVITES|CANCEL_GLYPH_CAST|CANCEL_LOOT_ROLL|CANCEL_SUMMON|CHALLENGE_MODE_COMPLETED|CHALLENGE_MODE_DEATH_COUNT_UPDATED|CHALLENGE_MODE_KEYSTONE_RECEPTABLE_OPEN|CHALLENGE_MODE_KEYSTONE_SLOTTED|CHALLENGE_MODE_LEADERS_UPDATE|CHALLENGE_MODE_MAPS_UPDATE|CHALLENGE_MODE_NEW_RECORD|CHALLENGE_MODE_RESET|CHALLENGE_MODE_START|CHANNEL_COUNT_UPDATE|CHANNEL_FLAGS_UPDATED|CHANNEL_INVITE_REQUEST|CHANNEL_PASSWORD_REQUEST|CHANNEL_ROSTER_UPDATE|CHANNEL_UI_UPDATE|CHANNEL_VOICE_UPDATE|CHARACTER_ITEM_FIXUP_NOTIFICATION|CHARACTER_POINTS_CHANGED|CHARACTER_UPGRADE_SPELL_TIER_SET|CHAT_COMBAT_MSG_ARENA_POINTS_GAIN|CHAT_MSG_ACHIEVEMENT|CHAT_MSG_ADDON|CHAT_MSG_AFK|CHAT_MSG_BG_SYSTEM_ALLIANCE|CHAT_MSG_BG_SYSTEM_HORDE|CHAT_MSG_BG_SYSTEM_NEUTRAL|CHAT_MSG_BN_INLINE_TOAST_ALERT|CHAT_MSG_BN_INLINE_TOAST_BROADCAST|CHAT_MSG_BN_INLINE_TOAST_BROADCAST_INFORM|CHAT_MSG_BN_INLINE_TOAST_CONVERSATION|CHAT_MSG_BN_WHISPER|CHAT_MSG_BN_WHISPER_INFORM|CHAT_MSG_BN_WHISPER_PLAYER_OFFLINE|CHAT_MSG_CHANNEL|CHAT_MSG_CHANNEL_JOIN|CHAT_MSG_CHANNEL_LEAVE|CHAT_MSG_CHANNEL_LIST|CHAT_MSG_CHANNEL_NOTICE|CHAT_MSG_CHANNEL_NOTICE_USER|CHAT_MSG_COMBAT_FACTION_CHANGE|CHAT_MSG_COMBAT_HONOR_GAIN|CHAT_MSG_COMBAT_MISC_INFO|CHAT_MSG_COMBAT_XP_GAIN|CHAT_MSG_CURRENCY|CHAT_MSG_DND|CHAT_MSG_EMOTE|CHAT_MSG_FILTERED|CHAT_MSG_GUILD|CHAT_MSG_GUILD_ACHIEVEMENT|CHAT_MSG_GUILD_ITEM_LOOTED|CHAT_MSG_IGNORED|CHAT_MSG_INSTANCE_CHAT|CHAT_MSG_INSTANCE_CHAT_LEADER|CHAT_MSG_LOOT|CHAT_MSG_MONEY|CHAT_MSG_MONSTER_EMOTE|CHAT_MSG_MONSTER_PARTY|CHAT_MSG_MONSTER_SAY|CHAT_MSG_MONSTER_WHISPER|CHAT_MSG_MONSTER_YELL|CHAT_MSG_OFFICER|CHAT_MSG_OPENING|CHAT_MSG_PARTY|CHAT_MSG_PARTY_LEADER|CHAT_MSG_PET_BATTLE_COMBAT_LOG|CHAT_MSG_PET_BATTLE_INFO|CHAT_MSG_PET_INFO|CHAT_MSG_RAID|CHAT_MSG_RAID_BOSS_EMOTE|CHAT_MSG_RAID_BOSS_WHISPER|CHAT_MSG_RAID_LEADER|CHAT_MSG_RAID_WARNING|CHAT_MSG_RESTRICTED|CHAT_MSG_SAY|CHAT_MSG_SKILL|CHAT_MSG_SYSTEM|CHAT_MSG_TARGETICONS|CHAT_MSG_TEXT_EMOTE|CHAT_MSG_TRADESKILLS|CHAT_MSG_WHISPER|CHAT_MSG_WHISPER_INFORM|CHAT_MSG_YELL|CHAT_SERVER_DISCONNECTED|CHAT_SERVER_RECONNECTED|CINEMATIC_START|CINEMATIC_STOP|CLEAR_BOSS_EMOTES|CLOSE_INBOX_ITEM|CLOSE_TABARD_FRAME|CLOSE_WORLD_MAP|COMBAT_LOG_EVENT|COMBAT_LOG_EVENT_UNFILTERED|COMBAT_RATING_UPDATE|COMBAT_TEXT_UPDATE|COMMENTATOR_ENTER_WORLD|COMMENTATOR_MAP_UPDATE|COMMENTATOR_PARTY_INFO_REQUEST|COMMENTATOR_PLAYER_NAME_OVERRIDE_UPDATE|COMMENTATOR_PLAYER_UPDATE|COMPACT_UNIT_FRAME_PROFILES_LOADED|COMPANION_LEARNED|COMPANION_UNLEARNED|COMPANION_UPDATE|CONFIRM_BEFORE_USE|CONFIRM_BINDER|CONFIRM_DISENCHANT_ROLL|CONFIRM_LOOT_ROLL|CONFIRM_SUMMON|CONFIRM_TALENT_WIPE|CONFIRM_XP_LOSS|CONSOLE_MESSAGE|CONTRIBUTION_COLLECTOR_CLOSE|CONTRIBUTION_COLLECTOR_OPEN|CONTRIBUTION_COLLECTOR_PENDING|CONTRIBUTION_COLLECTOR_UPDATE|CONTRIBUTION_COLLECTOR_UPDATE_SINGLE|CORPSE_IN_INSTANCE|CORPSE_IN_RANGE|CORPSE_OUT_OF_RANGE|CRITERIA_COMPLETE|CRITERIA_EARNED|CRITERIA_UPDATE|CURRENCY_DISPLAY_UPDATE|CURRENT_SPELL_CAST_CHANGED|CURSOR_UPDATE|CVAR_UPDATE)\1 name support.constant.event-name.wow-api.lua diff --git a/themes/theme-defaults/fileicons/vs_minimal_icons.json b/themes/theme-defaults/fileicons/vs_minimal-icon-theme.json similarity index 100% rename from themes/theme-defaults/fileicons/vs_minimal_icons.json rename to themes/theme-defaults/fileicons/vs_minimal-icon-theme.json diff --git a/themes/theme-defaults/package.json b/themes/theme-defaults/package.json index a73e265..7a48ad6 100644 --- a/themes/theme-defaults/package.json +++ b/themes/theme-defaults/package.json @@ -43,7 +43,7 @@ { "id": "vs-minimal", "label": "Minimal (Visual Studio Code)", - "path": "./fileicons/vs_minimal_icons.json" + "path": "./fileicons/vs_minimal-icon-theme.json" } ] } diff --git a/themes/theme-defaults/themes/dark_plus.json b/themes/theme-defaults/themes/dark_plus.json index 972481b..6fdfb22 100644 --- a/themes/theme-defaults/themes/dark_plus.json +++ b/themes/theme-defaults/themes/dark_plus.json @@ -101,6 +101,59 @@ "settings": { "foreground": "#CE9178" } + }, + { + "name": "Regular expression groups", + "scope": [ + "punctuation.definition.group.regexp", + "punctuation.definition.group.assertion.regexp", + "punctuation.definition.character-class.regexp", + "punctuation.character.set.begin.regexp", + "punctuation.character.set.end.regexp", + "keyword.operator.negation.regexp", + "support.other.parenthesis.regexp" + ], + "settings": { + "foreground": "#CE9178" + } + }, + { + "scope": [ + "constant.character.character-class.regexp", + "constant.other.character-class.set.regexp", + "constant.other.character-class.regexp", + "constant.character.set.regexp" + ], + "settings": { + "foreground": "#d16969" + } + }, + { + "scope": [ + "keyword.operator.or.regexp", + "keyword.control.anchor.regexp" + ], + "settings": { + "foreground": "#DCDCAA" + } + }, + { + "scope": "keyword.operator.quantifier.regexp", + "settings": { + "foreground": "#d7ba7d" + } + }, + { + "scope": "constant.character", + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": "constant.character.escape", + "settings": { + "foreground": "#d7ba7d" + } } ] } \ No newline at end of file diff --git a/themes/theme-defaults/themes/dark_vs.json b/themes/theme-defaults/themes/dark_vs.json index 4dd90c7..0847205 100644 --- a/themes/theme-defaults/themes/dark_vs.json +++ b/themes/theme-defaults/themes/dark_vs.json @@ -9,6 +9,16 @@ "background": "#1E1E1E" } }, + { + "scope": [ + "meta.embedded", + "source.groovy.embedded" + ], + "settings": { + "foreground": "#D4D4D4", + "background": "#1E1E1E" + } + }, { "scope": "emphasis", "settings": { @@ -241,11 +251,11 @@ } }, { - "name": "JavaScript string interpolation ${}", + "name": "String interpolation", "scope": [ "punctuation.definition.template-expression.begin", "punctuation.definition.template-expression.end", - "punctuation.section.embedded.coffee" + "punctuation.section.embedded" ], "settings": { "foreground": "#569cd6" diff --git a/themes/theme-defaults/themes/hc_black_defaults.json b/themes/theme-defaults/themes/hc_black_defaults.json index 986fa7c..8833ff3 100644 --- a/themes/theme-defaults/themes/hc_black_defaults.json +++ b/themes/theme-defaults/themes/hc_black_defaults.json @@ -14,6 +14,16 @@ "background": "#000000" } }, + { + "scope": [ + "meta.embedded", + "source.groovy.embedded" + ], + "settings": { + "foreground": "#FFFFFF", + "background": "#000000" + } + }, { "scope": "emphasis", "settings": { @@ -61,6 +71,12 @@ "foreground": "#b46695" } }, + { + "scope": "constant.character", + "settings": { + "foreground": "#569cd6" + } + }, { "scope": "entity.name.tag", "settings": { @@ -227,11 +243,11 @@ } }, { - "name": "JavaScript string interpolation ${}", + "name": "String interpolation", "scope": [ "punctuation.definition.template-expression.begin", "punctuation.definition.template-expression.end", - "punctuation.section.embedded.coffee" + "punctuation.section.embedded" ], "settings": { "foreground": "#569cd6" diff --git a/themes/theme-defaults/themes/light_plus.json b/themes/theme-defaults/themes/light_plus.json index c087a8f..3d5775e 100644 --- a/themes/theme-defaults/themes/light_plus.json +++ b/themes/theme-defaults/themes/light_plus.json @@ -101,6 +101,60 @@ "settings": { "foreground": "#0451a5" } + }, + { + "name": "Regular expression groups", + "scope": [ + "punctuation.definition.group.regexp", + "punctuation.definition.group.assertion.regexp", + "punctuation.definition.character-class.regexp", + "punctuation.character.set.begin.regexp", + "punctuation.character.set.end.regexp", + "keyword.operator.negation.regexp", + "support.other.parenthesis.regexp" + ], + "settings": { + "foreground": "#d16969" + } + }, + { + "scope": [ + "constant.character.character-class.regexp", + "constant.other.character-class.set.regexp", + "constant.other.character-class.regexp", + "constant.character.set.regexp" + ], + "settings": { + "foreground": "#811f3f" + } + }, + { + "scope": "keyword.operator.quantifier.regexp", + "settings": { + "foreground": "#000000" + } + }, + { + "scope": [ + "keyword.operator.or.regexp", + "keyword.control.anchor.regexp" + ], + "settings": { + "foreground": "#ff0000" + } + }, + { + "scope": "constant.character", + "settings": { + "foreground": "#0000ff" + } + }, + { + "scope": "constant.character.escape", + "settings": { + "foreground": "#a31515" + } } + ] } \ No newline at end of file diff --git a/themes/theme-defaults/themes/light_vs.json b/themes/theme-defaults/themes/light_vs.json index 162c32f..883d883 100644 --- a/themes/theme-defaults/themes/light_vs.json +++ b/themes/theme-defaults/themes/light_vs.json @@ -3,6 +3,13 @@ "name": "Light (Visual Studio)", "include": "./light_defaults.json", "tokenColors": [ + { + "scope": ["meta.embedded", "source.groovy.embedded"], + "settings": { + "foreground": "#000000ff", + "background":"#ffffffff" + } + }, { "scope": "emphasis", "settings": { @@ -237,11 +244,11 @@ } }, { - "name": "JavaScript string interpolation ${}", + "name": "String interpolation", "scope": [ "punctuation.definition.template-expression.begin", "punctuation.definition.template-expression.end", - "punctuation.section.embedded.coffee" + "punctuation.section.embedded" ], "settings": { "foreground": "#0000ff" diff --git a/themes/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json b/themes/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json index 60277bb..e090cc5 100644 --- a/themes/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json +++ b/themes/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json @@ -51,11 +51,21 @@ "foreground": "#c5c8c6ff" } }, + { + "scope": [ + "meta.embedded", + "source.groovy.embedded" + ], + "settings": { + "background": "#1e1e1e", + "foreground": "#C5C8C6" + } + }, { "name": "Comment", "scope": "comment", "settings": { - "fontStyle": "\n ", + "fontStyle": "", "foreground": "#9A9B99" } }, @@ -63,7 +73,7 @@ "name": "String", "scope": "string", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9AA83A" } }, @@ -71,7 +81,7 @@ "name": "String Embedded Source", "scope": "string source", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#D08442" } }, @@ -79,7 +89,7 @@ "name": "Number", "scope": "constant.numeric", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#6089B4" } }, @@ -87,7 +97,7 @@ "name": "Built-in constant", "scope": "constant.language", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#408080" } }, @@ -95,7 +105,7 @@ "name": "User-defined constant", "scope": "constant.character, constant.other", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#8080FF", "background": "#1e1e1e" } @@ -104,7 +114,7 @@ "name": "Keyword", "scope": "keyword", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#6089B4" } }, @@ -112,7 +122,7 @@ "name": "Support", "scope": "support", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#C7444A" } }, @@ -120,7 +130,7 @@ "name": "Storage", "scope": "storage", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9872A2" } }, @@ -128,7 +138,7 @@ "name": "Class name", "scope": "entity.name.class, entity.name.type", "settings": { - "fontStyle": "\n \t\t\t \t", + "fontStyle": "", "foreground": "#9B0000", "background": "#1E1E1E" } @@ -137,7 +147,7 @@ "name": "Inherited class", "scope": "entity.other.inherited-class", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#C7444A" } }, @@ -145,7 +155,7 @@ "name": "Function name", "scope": "entity.name.function", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#CE6700" } }, @@ -153,7 +163,7 @@ "name": "Function argument", "scope": "variable.parameter", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#6089B4" } }, @@ -161,7 +171,7 @@ "name": "Tag name", "scope": "entity.name.tag", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9872A2" } }, @@ -169,7 +179,7 @@ "name": "Tag attribute", "scope": "entity.other.attribute-name", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9872A2" } }, @@ -177,7 +187,7 @@ "name": "Library function", "scope": "support.function", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9872A2" } }, @@ -185,7 +195,7 @@ "name": "Keyword", "scope": "keyword", "settings": { - "fontStyle": "\n \t\t\t\t", + "fontStyle": "", "foreground": "#676867" } }, @@ -193,7 +203,7 @@ "name": "Class Variable", "scope": "variable.other, variable.js, punctuation.separator.variable", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#6089B4" } }, @@ -201,7 +211,7 @@ "name": "Language Constant", "scope": "constant.language", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#FF0080" } }, @@ -209,7 +219,7 @@ "name": "Meta Brace", "scope": "punctuation.section.embedded -(source string source punctuation.section.embedded), meta.brace.erb.html", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#008200" } }, @@ -217,7 +227,7 @@ "name": "Invalid", "scope": "invalid", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#FF0B00" } }, @@ -225,7 +235,7 @@ "name": "Normal Variable", "scope": "variable.other.php, variable.other.normal", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#6089B4" } }, @@ -233,7 +243,7 @@ "name": "Function Object", "scope": "meta.function-call.object", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9872A2" } }, @@ -241,7 +251,7 @@ "name": "Function Call Variable", "scope": "variable.other.property", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9872A2" } }, @@ -249,7 +259,7 @@ "name": "Keyword Control", "scope": "keyword.control", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9872A2" } }, @@ -257,7 +267,7 @@ "name": "Tag", "scope": "meta.tag", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#D0B344" } }, @@ -265,7 +275,7 @@ "name": "Tag Name", "scope": "entity.name.tag", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#6089B4" } }, @@ -273,7 +283,7 @@ "name": "Doctype", "scope": "meta.doctype, meta.tag.sgml-declaration.doctype, meta.tag.sgml.doctype", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9AA83A" } }, @@ -281,7 +291,7 @@ "name": "Tag Inline Source", "scope": "meta.tag.inline source, text.html.php.source", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9AA83A" } }, @@ -289,7 +299,7 @@ "name": "Tag Other", "scope": "meta.tag.other, entity.name.tag.style, entity.name.tag.script, meta.tag.block.script, source.js.embedded punctuation.definition.tag.html, source.css.embedded punctuation.definition.tag.html", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9872A2" } }, @@ -297,7 +307,7 @@ "name": "Tag Attribute", "scope": "entity.other.attribute-name, meta.tag punctuation.definition.string", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#D0B344" } }, @@ -305,7 +315,7 @@ "name": "Tag Value", "scope": "meta.tag string -source -punctuation, text source text meta.tag string -punctuation", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#6089B4" } }, @@ -313,7 +323,7 @@ "name": "Meta Brace", "scope": "punctuation.section.embedded -(source string source punctuation.section.embedded), meta.brace.erb.html", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#D0B344" } }, @@ -328,7 +338,7 @@ "name": "HTML String", "scope": "string.quoted.double.html, punctuation.definition.string.begin.html, punctuation.definition.string.end.html", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9AA83A" } }, @@ -336,7 +346,7 @@ "name": "HTML Tags", "scope": "punctuation.definition.tag.html, punctuation.definition.tag.begin, punctuation.definition.tag.end", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#6089B4" } }, @@ -344,7 +354,7 @@ "name": "CSS ID", "scope": "meta.selector.css entity.other.attribute-name.id", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9872A2" } }, @@ -352,7 +362,7 @@ "name": "CSS Property Name", "scope": "support.type.property-name.css", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#676867" } }, @@ -360,7 +370,7 @@ "name": "CSS Property Value", "scope": "meta.property-group support.constant.property-value.css, meta.property-value support.constant.property-value.css", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#C7444A" } }, @@ -394,7 +404,7 @@ "name": "PHP Function Call", "scope": "meta.function-call.object.php", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#D0B344" } }, @@ -416,7 +426,7 @@ "name": "PHP Punctuation Embedded", "scope": "punctuation.section.embedded.begin.php, punctuation.section.embedded.end.php", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#D08442" } }, @@ -424,7 +434,7 @@ "name": "Ruby Symbol", "scope": "constant.other.symbol.ruby", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#9AA83A" } }, @@ -432,7 +442,7 @@ "name": "Ruby Variable", "scope": "variable.language.ruby", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#D0B344" } }, @@ -440,13 +450,16 @@ "name": "Ruby Special Method", "scope": "keyword.other.special-method.ruby", "settings": { - "fontStyle": "\n \t\t\t", + "fontStyle": "", "foreground": "#D9B700" } }, { "name": "Ruby Embedded Source", - "scope": "source.ruby.embedded.source", + "scope": [ + "punctuation.section.embedded.begin.ruby", + "punctuation.section.embedded.end.ruby" + ], "settings": { "foreground": "#D08442" } @@ -455,7 +468,7 @@ "name": "SQL", "scope": "keyword.other.DML.sql", "settings": { - "fontStyle": "\n \t\t\t\t", + "fontStyle": "", "foreground": "#D0B344" } }, diff --git a/themes/theme-monokai/themes/monokai-color-theme.json b/themes/theme-monokai/themes/monokai-color-theme.json index fa42db4..a1324d9 100644 --- a/themes/theme-monokai/themes/monokai-color-theme.json +++ b/themes/theme-monokai/themes/monokai-color-theme.json @@ -18,7 +18,8 @@ "editor.background": "#272822", "editor.foreground": "#f8f8f2", "selection.background": "#ccccc7", - "editor.selectionBackground": "#49483e", + "editor.selectionHighlightBackground": "#665044cc", + "editor.selectionBackground": "#334444cc", "editor.lineHighlightBackground": "#3e3d32", "editorCursor.foreground": "#f8f8f0", "editorWhitespace.foreground": "#464741", @@ -72,22 +73,22 @@ "peekViewResult.selectionBackground": "#414339", "peekViewResult.matchHighlightBackground": "#75715E", "peekViewEditor.matchHighlightBackground": "#75715E", - "terminal.ansiBlack": "#333333", - "terminal.ansiRed": "#C4265E", // the bright color with ~75% transparent on the background - "terminal.ansiGreen": "#86B42B", - "terminal.ansiYellow": "#B3B42B", - "terminal.ansiBlue": "#6A7EC8", - "terminal.ansiMagenta": "#8C6BC8", - "terminal.ansiCyan": "#56ADBC", - "terminal.ansiWhite": "#e3e3dd", - "terminal.ansiBrightBlack": "#666666", - "terminal.ansiBrightRed": "#f92672", - "terminal.ansiBrightGreen": "#A6E22E", - "terminal.ansiBrightYellow": "#e2e22e", // hue shifted #A6E22E - "terminal.ansiBrightBlue": "#819aff", // hue shifted #AE81FF - "terminal.ansiBrightMagenta": "#AE81FF", - "terminal.ansiBrightCyan": "#66D9EF", - "terminal.ansiBrightWhite": "#f8f8f2" + "terminal.ansiBlack": "#333333", + "terminal.ansiRed": "#C4265E", // the bright color with ~75% transparent on the background + "terminal.ansiGreen": "#86B42B", + "terminal.ansiYellow": "#B3B42B", + "terminal.ansiBlue": "#6A7EC8", + "terminal.ansiMagenta": "#8C6BC8", + "terminal.ansiCyan": "#56ADBC", + "terminal.ansiWhite": "#e3e3dd", + "terminal.ansiBrightBlack": "#666666", + "terminal.ansiBrightRed": "#f92672", + "terminal.ansiBrightGreen": "#A6E22E", + "terminal.ansiBrightYellow": "#e2e22e", // hue shifted #A6E22E + "terminal.ansiBrightBlue": "#819aff", // hue shifted #AE81FF + "terminal.ansiBrightMagenta": "#AE81FF", + "terminal.ansiBrightCyan": "#66D9EF", + "terminal.ansiBrightWhite": "#f8f8f2" }, "tokenColors": [ { @@ -96,6 +97,16 @@ "foreground": "#F8F8F2" } }, + { + "scope": [ + "meta.embedded", + "source.groovy.embedded" + ], + "settings": { + "background": "#272822", + "foreground": "#F8F8F2" + } + }, { "name": "Comment", "scope": "comment", @@ -114,7 +125,7 @@ "name": "Template Definition", "scope": [ "punctuation.definition.template-expression", - "punctuation.section.embedded.coffee" + "punctuation.section.embedded" ], "settings": { "foreground": "#F92672" @@ -400,4 +411,4 @@ } } ] -} +} \ No newline at end of file