diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,54 @@ +50200.12.0 +========== + +New features: + * Matterhorn now supports multiple teams! This includes a number of UI + changes: + * Matterhorn no longer prompts for a team on startup. + * If the configuration file sets `team`, Matterhorn will attempt to + honor that by selecting that as the active team on startup. + If the configuration does not specify the `team` setting, the + initially-selected team is chosen as the first team after sorting + the team list alphabetically. + * The window title now reflects the sum of all unread channels in all + teams, rather than the number of unread channels in the current + team. + * If the user is a member of more than one team, the list of teams + will be displayed at the top of the window with the active team + highlighted. Each team with unread channels will display the count + of unread channels next to the team name and teams with unread + channels will be highlighted. This change comes with a new theme + attribute, `currentTeam`, to style the selected team in the list. + * The current team selection can be changed with new keybindings: + * `next-team` (default binding: `C-Right`) + * `prev-team` (default binding: `C-Left`) + * The team list can be reordered manually. In the official web + client, the team list can be reordered by dragging and dropping + the team icons; in Matterhorn, this can be done by using two new + commands, `/move-team-left` and `/move-team-right`, respectively. + New keybindings to do the same thing were also added: + * `move-current-team-left` (unbound by default) + * `move-current-team-right` (unbound by default) + * The new `/rename-channel-url` command renames the current channel's + URL name. This differs from the server command `/rename`, which + renames the current channel's display name. Renaming the URL name + with this command is equivalent to changing the value of the "URL" + field in the "Rename Channel" dialog box in the official web client. + (thanks to Ajay Eeralla for this work) + +Other improvements: + * The channel list now takes up the full window height. Previously + the message editor and input preview were displayed across the entire + screen; now those areas stop at the channel list, so the channel list + gets a few more rows of space to display channels. + * Matterhorn now parses all incoming Markdown text with the Haskell + `commonmark` library. Migrating to `commonmark` improved our support + for many Markdown extensions and improved how Matterhorn handles some + Markdown syntax. + * The syntax highlighting XML files in `syntax/` were updated from + version 0.10.0.3 of the `skylighting` package. + 50200.11.0 ========== @@ -60,7 +110,7 @@ (`~`) * Channel mute status (`(m)`) * Unread status and visual style - * When composing replies, Mattehorn now displays the threat root + * When composing replies, Mattehorn now displays the thread root message of the thread being replied to, rather than the message the user selected for reply (#670). This is intended to be less surprising than the old behavior since showing the root post in the diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ # Features * Channel creation, deletion, and membership management commands +* Support for multiple teams * Optimized channel-switching modes: `M-a`, `M-s`, and `C-g` * Message posting, editing, replying, and deletion * Markdown rendering diff --git a/docs/commands.md b/docs/commands.md --- a/docs/commands.md +++ b/docs/commands.md @@ -25,6 +25,8 @@ | `/log-stop` | Stop logging | | `/members` | Show the current channel's members | | `/message-preview` | Toggle preview of the current message | +| `/move-team-left` | Move the currently-selected team to the left in the team list | +| `/move-team-right` | Move the currently-selected team to the right in the team list | | `/msg` | Search for a user to enter a private chat | | `/msg <@user>` | Chat with the specified user | | `/msg <@user> ` | Go to a user's channel and send the specified message or command | @@ -33,6 +35,7 @@ | `/quit` | Exit Matterhorn | | `/reconnect` | Force a reconnection attempt to the server | | `/remove-user <@user>` | Remove a user from the current channel | +| `/rename-channel-url ` | Rename the current channel's URL name | | `/right` | Focus on the next channel | | `/search ` | Search for posts with given terms | | `/sh` | List the available shell scripts | diff --git a/docs/keybindings.md b/docs/keybindings.md --- a/docs/keybindings.md +++ b/docs/keybindings.md @@ -24,6 +24,10 @@ | `M-p` | `toggle-message-preview` | Toggle message preview | | `F2` | `toggle-channel-list-visibility` | Toggle channel list visibility | | `F3` | `toggle-expanded-channel-topics` | Toggle display of expanded channel topics | +| `C-Right` | `next-team` | Switch to the next available team | +| `C-Left` | `prev-team` | Switch to the previous available team | +| (unbound) | `move-current-team-left` | Move the current team to the left in the team list | +| (unbound) | `move-current-team-right` | Move the current team to the right in the team list | | `M-k` | `invoke-editor` | Invoke `$EDITOR` to edit the current message | | `C-g` | `enter-fast-select` | Enter fast channel selection mode | | `C-q` | `quit` | Quit | @@ -37,7 +41,7 @@ | `C-p` | `focus-prev-channel` | Change to the previous channel in the channel list | | `M-a` | `focus-next-unread` | Change to the next channel with unread messages or return to the channel marked '~' | | `C-x` | `show-attachment-list` | Show the attachment list | -| `(unbound)` | focus-next-unread-user-or-channel | Change to the next channel with unread messages preferring direct messages | +| (unbound) | `focus-next-unread-user-or-channel` | Change to the next channel with unread messages preferring direct messages | | `M-s` | `focus-last-channel` | Change to the most recently-focused channel | | `Enter` | (non-customizable key) | Send the current message | | `C-o` | `enter-url-open` | Select and open a URL posted to the current channel | diff --git a/matterhorn.cabal b/matterhorn.cabal --- a/matterhorn.cabal +++ b/matterhorn.cabal @@ -1,5 +1,5 @@ name: matterhorn -version: 50200.11.0 +version: 50200.12.0 synopsis: Terminal client for the Mattermost chat system description: This is a terminal client for the Mattermost chat system. Please see the README for a list of @@ -63,6 +63,8 @@ Matterhorn.Draw.PostListOverlay Matterhorn.Draw.ReactionEmojiListOverlay Matterhorn.Draw.RichText + Matterhorn.Draw.RichText.Wrap + Matterhorn.Draw.RichText.Flatten Matterhorn.Draw.ShowHelp Matterhorn.Draw.TabbedWindow Matterhorn.Draw.ThemeListOverlay @@ -88,6 +90,7 @@ Matterhorn.Events.ThemeListOverlay Matterhorn.Events.UrlSelect Matterhorn.Events.UserListOverlay + Matterhorn.Events.Websocket Matterhorn.FilePaths Matterhorn.HelpTopics Matterhorn.IOUtil @@ -101,6 +104,7 @@ Matterhorn.State.Async Matterhorn.State.Attachments Matterhorn.State.Autocomplete + Matterhorn.State.ChannelList Matterhorn.State.ChannelListOverlay Matterhorn.State.ChannelSelect Matterhorn.State.Channels @@ -121,11 +125,11 @@ Matterhorn.State.Setup Matterhorn.State.Setup.Threads Matterhorn.State.Setup.Threads.Logging + Matterhorn.State.Teams Matterhorn.State.ThemeListOverlay Matterhorn.State.UrlSelect Matterhorn.State.UserListOverlay Matterhorn.State.Users - Matterhorn.TeamSelect Matterhorn.Themes Matterhorn.TimeUtils Matterhorn.Types @@ -150,7 +154,7 @@ ghc-options: -fhide-source-paths build-depends: base >=4.8 && <5 - , mattermost-api == 50200.9.0 + , mattermost-api == 50200.10.0 , base-compat >= 0.9 && < 0.12 , unordered-containers >= 0.2 && < 0.3 , containers >= 0.5.7 && < 0.7 @@ -164,9 +168,9 @@ , config-ini >= 0.2.2.0 && < 0.3 , process >= 1.4 && < 1.7 , microlens-platform >= 0.3 && < 0.5 - , brick >= 0.57 && < 0.58 + , brick >= 0.59 && < 0.60 , brick-skylighting >= 0.2 && < 0.4 - , vty >= 5.31 && < 5.32 + , vty >= 5.32 && < 5.33 , word-wrap >= 0.4.0 && < 0.5 , transformers >= 0.4 && < 0.6 , text-zipper >= 0.10 && < 0.11 @@ -177,13 +181,15 @@ , vector < 0.13 , strict >= 0.3 && < 0.4 , hashable >= 1.2 && < 1.4 - , cheapskate >= 0.1 && < 0.2 + , commonmark >= 0.1.1.3 && < 0.2 + , commonmark-extensions >= 0.2.0.4 && < 0.3 + , parsec >= 3.1 && < 3.2 , utf8-string >= 1.0 && < 1.1 , temporary >= 1.2 && < 1.4 , gitrev >= 1.3 && < 1.4 , Hclip >= 3.0 && < 3.1 , mtl >= 2.2 && < 2.3 - , aspell-pipe >= 0.4 && < 0.5 + , aspell-pipe >= 0.6 && < 0.7 , stm-delay >= 0.1 && < 0.2 , unix >= 2.7.1.0 && < 2.7.3.0 , skylighting-core >= 0.8 && < 0.9 @@ -212,7 +218,7 @@ test-suite test_messages type: exitcode-stdio-1.0 main-is: test_messages.hs - other-modules: Cheapskate_QCA + other-modules: RichText_QCA , Message_QCA default-language: Haskell2010 default-extensions: OverloadedStrings @@ -229,7 +235,7 @@ , tasty-hunit >= 0.9 && < 0.12 , tasty-quickcheck >= 0.8 && < 0.12 , bytestring - , cheapskate + , commonmark , containers , matterhorn , mattermost-api diff --git a/src/Matterhorn/App.hs b/src/Matterhorn/App.hs --- a/src/Matterhorn/App.hs +++ b/src/Matterhorn/App.hs @@ -9,6 +9,7 @@ import Brick import Control.Monad.Trans.Except ( runExceptT ) +import qualified Data.HashMap.Strict as HM import qualified Graphics.Vty as Vty import Text.Aspell ( stopAspell ) import GHC.Conc (getNumProcessors, setNumCapabilities) @@ -31,7 +32,7 @@ app :: App ChatState MHEvent Name app = App { appDraw = draw - , appChooseCursor = \s cs -> case appMode s of + , appChooseCursor = \s cs -> case s^.csCurrentTeam.tsMode of Main -> showFirstCursor s cs ChannelSelect -> showFirstCursor s cs UserListOverlay -> showFirstCursor s cs @@ -39,7 +40,8 @@ ChannelListOverlay -> showFirstCursor s cs ManageAttachmentsBrowseFiles -> showFirstCursor s cs ThemeListOverlay -> showFirstCursor s cs - ChannelTopicWindow -> showCursorNamed ChannelTopicEditor cs + ChannelTopicWindow -> let tId = s^.csCurrentTeamId + in showCursorNamed (ChannelTopicEditor tId) cs LeaveChannelConfirm -> Nothing DeleteChannelConfirm -> Nothing MessageSelect -> Nothing @@ -87,9 +89,10 @@ (st, vty) <- setupState mkVty (optLogLocation opts) config finalSt <- customMain vty mkVty (Just $ st^.csResources.crEventQueue) app st - case finalSt^.csEditState.cedSpellChecker of - Nothing -> return () - Just (s, _) -> stopAspell s + forM_ (HM.elems $ finalSt^.csTeams) $ \ts -> + case ts^.tsEditState.cedSpellChecker of + Nothing -> return () + Just (s, _) -> stopAspell s return finalSt @@ -99,11 +102,11 @@ logIfError (mmCloseSession $ getResourceSession $ finalSt^.csResources) "Error in closing session" - logIfError (writeHistory (finalSt^.csEditState.cedInputHistory)) + logIfError (writeHistory (finalSt^.csInputHistory)) "Error in writing history" - logIfError (writeLastRunState finalSt) - "Error in writing last run state" + logIfError (writeLastRunStates finalSt) + "Error in writing last run states" shutdownLogManager $ finalSt^.csResources.crLogManager diff --git a/src/Matterhorn/Command.hs b/src/Matterhorn/Command.hs --- a/src/Matterhorn/Command.hs +++ b/src/Matterhorn/Command.hs @@ -27,6 +27,7 @@ import Matterhorn.Scripts import Matterhorn.State.Help import Matterhorn.State.Editing +import Matterhorn.State.ChannelList import Matterhorn.State.Channels import Matterhorn.State.ChannelTopicWindow import Matterhorn.State.ChannelSelect @@ -38,6 +39,7 @@ import Matterhorn.State.Messages import Matterhorn.State.NotifyPrefs import Matterhorn.State.Common ( postInfoMessage ) +import Matterhorn.State.Teams import Matterhorn.State.Users import Matterhorn.Themes ( attrForUsername ) import Matterhorn.Types @@ -97,58 +99,59 @@ [ Cmd "quit" "Exit Matterhorn" NoArg $ \ () -> requestQuit , Cmd "right" "Focus on the next channel" NoArg $ \ () -> - nextChannel + nextChannel , Cmd "left" "Focus on the previous channel" NoArg $ \ () -> - prevChannel + prevChannel , Cmd "create-channel" "Create a new public channel" (LineArg "channel name") $ \ name -> - createOrdinaryChannel True name + createOrdinaryChannel True name , Cmd "create-private-channel" "Create a new private channel" (LineArg "channel name") $ \ name -> - createOrdinaryChannel False name + createOrdinaryChannel False name , Cmd "delete-channel" "Delete the current channel" NoArg $ \ () -> - beginCurrentChannelDeleteConfirm + beginCurrentChannelDeleteConfirm , Cmd "hide" "Hide the current DM or group channel from the channel list" NoArg $ \ () -> do - hideDMChannel =<< use csCurrentChannelId + tId <- use csCurrentTeamId + hideDMChannel =<< use (csCurrentChannelId tId) , Cmd "reconnect" "Force a reconnection attempt to the server" NoArg $ \ () -> - connectWebsockets + connectWebsockets , Cmd "members" "Show the current channel's members" NoArg $ \ () -> - enterChannelMembersUserList + enterChannelMembersUserList , Cmd "leave" "Leave a normal channel or hide a DM channel" NoArg $ \ () -> - startLeaveCurrentChannel + startLeaveCurrentChannel , Cmd "join" "Find a channel to join" NoArg $ \ () -> - enterChannelListOverlayMode + enterChannelListOverlayMode , Cmd "join" "Join the specified channel" (ChannelArg NoArg) $ \(n, ()) -> - joinChannelByName n + joinChannelByName n , Cmd "theme" "List the available themes" NoArg $ \ () -> - enterThemeListMode + enterThemeListMode , Cmd "theme" "Set the color theme" (TokenArg "theme" NoArg) $ \ (themeName, ()) -> - setTheme themeName + setTheme themeName , Cmd "topic" "Set the current channel's topic (header) interactively" NoArg $ \ () -> - openChannelTopicWindow + openChannelTopicWindow , Cmd "topic" "Set the current channel's topic (header)" (LineArg "topic") $ \ p -> - if not (T.null p) then setChannelTopic p else return () + if not (T.null p) then setChannelTopic p else return () , Cmd "add-user" "Search for a user to add to the current channel" NoArg $ \ () -> @@ -170,8 +173,9 @@ (UserArg $ LineArg "message or command") $ \ (name, msg) -> do withFetchedUserMaybe (UserFetchByUsername name) $ \foundUser -> do case foundUser of - Just user -> createOrFocusDMChannel user $ Just $ \cId -> - handleInputSubmission cId msg + Just user -> createOrFocusDMChannel user $ Just $ \cId -> do + tId <- use csCurrentTeamId + handleInputSubmission tId cId msg Nothing -> mhError $ NoSuchUser name , Cmd "log-start" "Begin logging debug information to the specified path" @@ -240,28 +244,38 @@ Just topic -> showHelpScreen topic , Cmd "sh" "List the available shell scripts" NoArg $ \ () -> - listScripts + listScripts , Cmd "group-msg" "Create a group chat" - (LineArg (userSigil <> "user [" <> userSigil <> "user ...]")) createGroupChannel + (LineArg (userSigil <> "user [" <> userSigil <> "user ...]")) + createGroupChannel , Cmd "sh" "Run a prewritten shell script" (TokenArg "script" (LineArg "message")) $ \ (script, text) -> do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) findAndRunScript cId script text , Cmd "flags" "Open a window of your flagged posts" NoArg $ \ () -> - enterFlaggedPostListMode + enterFlaggedPostListMode , Cmd "pinned-posts" "Open a window of this channel's pinned posts" NoArg $ \ () -> - enterPinnedPostListMode + enterPinnedPostListMode , Cmd "search" "Search for posts with given terms" (LineArg "terms") $ - enterSearchResultPostListMode + enterSearchResultPostListMode , Cmd "notify-prefs" "Edit the current channel's notification preferences" NoArg $ \_ -> - enterEditNotifyPrefsMode + enterEditNotifyPrefsMode + , Cmd "rename-channel-url" "Rename the current channel's URL name" (TokenArg "channel name" NoArg) $ \ (name, _) -> + renameChannelUrl name + + , Cmd "move-team-left" "Move the currently-selected team to the left in the team list" NoArg $ \_ -> + moveCurrentTeamLeft + + , Cmd "move-team-right" "Move the currently-selected team to the right in the team list" NoArg $ \_ -> + moveCurrentTeamRight ] displayUsernameAttribute :: Text -> MH () @@ -273,10 +287,10 @@ execMMCommand :: Text -> Text -> MH () execMMCommand name rest = do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) session <- getSession - em <- use (csEditState.cedEditMode) - tId <- gets myTeamId + em <- use (csCurrentTeam.tsEditState.cedEditMode) let mc = MM.MinCommand { MM.minComChannelId = cId , MM.minComCommand = "/" <> name <> " " <> rest @@ -335,4 +349,4 @@ toggleMessagePreview :: MH () toggleMessagePreview = do mh invalidateCache - csShowMessagePreview %= not + csResources.crConfiguration.configShowMessagePreviewL %= not diff --git a/src/Matterhorn/Constants.hs b/src/Matterhorn/Constants.hs --- a/src/Matterhorn/Constants.hs +++ b/src/Matterhorn/Constants.hs @@ -4,14 +4,19 @@ , numScrollbackPosts , previewMaxHeight , normalChannelSigil + , normalChannelSigilChar , userSigil + , userSigilChar + , editMarking ) where import Prelude () import Matterhorn.Prelude +import qualified Data.Text as T + -- | The number of rows to consider a "page" when scrolling pageAmount :: Int pageAmount = 15 @@ -29,7 +34,16 @@ -- Sigils normalChannelSigil :: Text -normalChannelSigil = "~" +normalChannelSigil = T.singleton normalChannelSigilChar +normalChannelSigilChar :: Char +normalChannelSigilChar = '~' + userSigil :: Text -userSigil = "@" +userSigil = T.singleton userSigilChar + +userSigilChar :: Char +userSigilChar = '@' + +editMarking :: Text +editMarking = "(edited)" diff --git a/src/Matterhorn/Draw.hs b/src/Matterhorn/Draw.hs --- a/src/Matterhorn/Draw.hs +++ b/src/Matterhorn/Draw.hs @@ -27,7 +27,7 @@ draw :: ChatState -> [Widget Name] draw st = - case appMode st of + case st^.csCurrentTeam.tsMode of Main -> mainLayers UrlSelect -> mainLayers ChannelSelect -> mainLayers @@ -49,4 +49,4 @@ where mainLayers = drawMain True st mainLayersMonochrome = drawMain False st - messageViewWindow = st^.csViewedMessage.singular _Just._2 + messageViewWindow = st^.csCurrentTeam.tsViewedMessage.singular _Just._2 diff --git a/src/Matterhorn/Draw/Autocomplete.hs b/src/Matterhorn/Draw/Autocomplete.hs --- a/src/Matterhorn/Draw/Autocomplete.hs +++ b/src/Matterhorn/Draw/Autocomplete.hs @@ -24,7 +24,7 @@ autocompleteLayer :: ChatState -> Widget Name autocompleteLayer st = - case st^.csEditState.cedAutocomplete of + case st^.csCurrentTeam.tsEditState.cedAutocomplete of Nothing -> emptyWidget Just ac -> @@ -64,7 +64,7 @@ else Widget Greedy Greedy $ do ctx <- getContext let rowOffset = ctx^.availHeightL - 3 - editorOffset - visibleHeight - editorOffset = if st^.csEditState.cedEphemeral.eesMultiline + editorOffset = if st^.csCurrentTeam.tsEditState.cedEphemeral.eesMultiline then multilineHeightLimit else 0 render $ translateBy (Location (0, rowOffset)) $ diff --git a/src/Matterhorn/Draw/ChannelList.hs b/src/Matterhorn/Draw/ChannelList.hs --- a/src/Matterhorn/Draw/ChannelList.hs +++ b/src/Matterhorn/Draw/ChannelList.hs @@ -66,21 +66,22 @@ selfHeader = hCenter $ colorUsername myUsername_ myUsername_ (T.singleton statusSigil <> " " <> userSigil <> myUsername_) - teamNameStr = sanitizeUserText $ MM.teamDisplayName $ st^.csMyTeam + teamNameStr = T.strip $ sanitizeUserText $ MM.teamDisplayName $ st^.csCurrentTeam.tsTeam statusSigil = maybe ' ' userSigilFromInfo me me = userById (myUserId st) st unreadCountHeader = hCenter $ txt $ "Unread: " <> (T.pack $ show unreadCount) - unreadCount = sum $ (channelListGroupUnread . fst) <$> Z.toList (st^.csFocus) + unreadCount = sum $ (channelListGroupUnread . fst) <$> Z.toList (st^.csCurrentTeam.tsFocus) renderChannelList :: ChatState -> Widget Name renderChannelList st = - viewport ChannelList Vertical body + viewport (ChannelList tId) Vertical body where myUsername_ = myUsername st renderEntry s e = renderChannelListEntry myUsername_ $ mkChannelEntryData s e - body = case appMode st of + tId = st^.csCurrentTeamId + body = case st^.csCurrentTeam.tsMode of ChannelSelect -> - let zipper = st^.csChannelSelectState.channelSelectMatches + let zipper = st^.csCurrentTeam.tsChannelSelectState.channelSelectMatches matches = if Z.isEmpty zipper then [hCenter $ txt "No matches"] else (renderChannelListGroup st @@ -90,10 +91,10 @@ renderChannelListHeader st : matches _ -> - cached ChannelSidebar $ + cached (ChannelSidebar tId) $ vBox $ renderChannelListHeader st : - (renderChannelListGroup st renderEntry <$> Z.toList (st^.csFocus)) + (renderChannelListGroup st renderEntry <$> Z.toList (st^.csCurrentTeam.tsFocus)) renderChannelListGroupHeading :: ChannelListGroup -> Widget Name renderChannelListGroupHeading g = diff --git a/src/Matterhorn/Draw/ChannelListOverlay.hs b/src/Matterhorn/Draw/ChannelListOverlay.hs --- a/src/Matterhorn/Draw/ChannelListOverlay.hs +++ b/src/Matterhorn/Draw/ChannelListOverlay.hs @@ -21,7 +21,7 @@ drawChannelListOverlay :: ChatState -> Widget Name drawChannelListOverlay st = - let overlay = drawListOverlay (st^.csChannelListOverlay) channelSearchScopeHeader + let overlay = drawListOverlay (st^.csCurrentTeam.tsChannelListOverlay) channelSearchScopeHeader channelSearchScopeNoResults channelSearchScopePrompt renderChannel Nothing diff --git a/src/Matterhorn/Draw/ChannelTopicWindow.hs b/src/Matterhorn/Draw/ChannelTopicWindow.hs --- a/src/Matterhorn/Draw/ChannelTopicWindow.hs +++ b/src/Matterhorn/Draw/ChannelTopicWindow.hs @@ -32,23 +32,24 @@ withFocusRing foc (renderEditor drawTopicEditorTxt) ed , hBorderWithLabel (withDefAttr clientEmphAttr $ txt "Preview") , vLimit previewHeight $ - viewport ChannelTopicEditorPreview Vertical $ + viewport (ChannelTopicEditorPreview tId) Vertical $ renderText' (Just baseUrl) "" hSet topicTxtWithCursor , hBorder , hBox [ padRight Max $ padLeft (Pad 1) $ - drawButton foc ChannelTopicSaveButton "Save" + drawButton foc (ChannelTopicSaveButton tId) "Save" , padRight (Pad 1) $ - drawButton foc ChannelTopicCancelButton "Cancel" + drawButton foc (ChannelTopicCancelButton tId) "Cancel" ] ] where - baseUrl = serverBaseUrl st + baseUrl = serverBaseUrl st tId + tId = st^.csCurrentTeamId editorHeight = 5 previewHeight = 5 maxWindowWidth = 70 - foc = st^.csChannelTopicDialog.channelTopicDialogFocus - ed = st^.csChannelTopicDialog.channelTopicDialogEditor + foc = st^.csCurrentTeam.tsChannelTopicDialog.channelTopicDialogFocus + ed = st^.csCurrentTeam.tsChannelTopicDialog.channelTopicDialogEditor hSet = getHighlightSet st topicTxtWithCursor = T.unlines $ getEditContents $ diff --git a/src/Matterhorn/Draw/Main.hs b/src/Matterhorn/Draw/Main.hs --- a/src/Matterhorn/Draw/Main.hs +++ b/src/Matterhorn/Draw/Main.hs @@ -12,6 +12,7 @@ import Brick.Widgets.Edit ( editContentsL, renderEditor, getEditContents ) import Control.Arrow ( (>>>) ) import Data.Char ( isSpace, isPunctuation ) +import qualified Data.Foldable as F import Data.List ( intersperse ) import qualified Data.Map as M import qualified Data.Sequence as Seq @@ -24,7 +25,8 @@ import Lens.Micro.Platform ( (.~), (^?!), to, view, folding ) import Network.Mattermost.Types ( ChannelId, Type(Direct, Private, Group) - , ServerTime(..), UserId + , ServerTime(..), UserId, TeamId, teamDisplayName + , teamId ) @@ -41,8 +43,11 @@ import Matterhorn.Themes import Matterhorn.TimeUtils ( justAfter, justBefore ) import Matterhorn.Types +import Matterhorn.Types.Common ( sanitizeUserText ) +import Matterhorn.Types.DirectionalSeq ( emptyDirSeq ) import Matterhorn.Types.RichText ( parseMarkdown, TeamBaseURL ) import Matterhorn.Types.KeyEvents +import qualified Matterhorn.Zipper as Z previewFromInput :: TeamBaseURL -> Maybe MessageType -> UserId -> Text -> Maybe Message @@ -93,14 +98,14 @@ drawEditorContents :: ChatState -> HighlightSet -> [Text] -> Widget Name drawEditorContents st hs = let noHighlight = txt . T.unlines - in case st^.csEditState.cedSpellChecker of + in case st^.csCurrentTeam.tsEditState.cedSpellChecker of Nothing -> noHighlight Just _ -> - case S.null (st^.csEditState.cedMisspellings) of + case S.null (st^.csCurrentTeam.tsEditState.cedMisspellings) of True -> noHighlight False -> doHighlightMisspellings hs - (st^.csEditState.cedMisspellings) + (st^.csCurrentTeam.tsEditState.cedMisspellings) -- | This function takes a set of misspellings from the spell -- checker, the editor lines, and builds a rendering of the text with @@ -224,24 +229,25 @@ renderUserCommandBox :: ChatState -> HighlightSet -> Widget Name renderUserCommandBox st hs = - let prompt = txt $ case st^.csEditState.cedEditMode of + let prompt = txt $ case st^.csCurrentTeam.tsEditState.cedEditMode of Replying _ _ -> "reply> " Editing _ _ -> "edit> " NewPost -> "> " - inputBox = renderEditor (drawEditorContents st hs) True (st^.csEditState.cedEditor) - curContents = getEditContents $ st^.csEditState.cedEditor + tId = st^.csCurrentTeamId + inputBox = renderEditor (drawEditorContents st hs) True (st^.csCurrentTeam.tsEditState.cedEditor) + curContents = getEditContents $ st^.csCurrentTeam.tsEditState.cedEditor multilineContent = length curContents > 1 multilineHints = hBox [ borderElem bsHorizontal , str $ "[" <> (show $ (+1) $ fst $ cursorPosition $ - st^.csEditState.cedEditor.editContentsL) <> + st^.csCurrentTeam.tsEditState.cedEditor.editContentsL) <> "/" <> (show $ length curContents) <> "]" , hBorderWithLabel $ withDefAttr clientEmphAttr $ txt $ "In multi-line mode. Press " <> multiLineToggleKey <> " to finish." ] - replyDisplay = case st^.csEditState.cedEditMode of + replyDisplay = case st^.csCurrentTeam.tsEditState.cedEditMode of Replying msg _ -> let msgWithoutParent = msg & mInReplyToMsg .~ NotAReply in hBox [ replyArrow @@ -266,7 +272,7 @@ multiLineToggleKey = ppBinding $ getFirstDefaultBinding ToggleMultiLineEvent - commandBox = case st^.csEditState.cedEphemeral.eesMultiline of + commandBox = case st^.csCurrentTeam.tsEditState.cedEphemeral.eesMultiline of False -> let linesStr = "line" <> if numLines == 1 then "" else "s" numLines = length curContents @@ -277,7 +283,7 @@ "; Enter: send, " <> T.unpack multiLineToggleKey <> ": edit, Backspace: cancel] " , txt $ head curContents - , showCursor MessageInput (Location (0,0)) $ str " " + , showCursor (MessageInput tId) (Location (0,0)) $ str " " ] else [inputBox] True -> vLimit multilineHeightLimit inputBox <=> multilineHints @@ -310,7 +316,7 @@ _ -> "" maybeTopic = if T.null topicStr then "" - else " - " <> if st^.csShowExpandedChannelTopics + else " - " <> if st^.csResources.crConfiguration.configShowExpandedChannelTopicsL then topicStr else firstTopicLine channelNameString = case chnType of @@ -326,7 +332,8 @@ channelNamePair channelNamePair = chanName <> " - " <> (chan^.ccInfo.cdDisplayName) chanName = mkChannelName st (chan^.ccInfo) - baseUrl = serverBaseUrl st + tId = st^.csCurrentTeamId + baseUrl = serverBaseUrl st tId in renderText' (Just baseUrl) (myUsername st) hs @@ -336,7 +343,7 @@ renderCurrentChannelDisplay st hs = header <=> hBorder <=> messages where header = - if st^.csShowChannelList + if st^.csResources.crConfiguration.configShowChannelListL then channelHeader else headerWithStatus @@ -366,7 +373,7 @@ headerWidget = Widget Fixed Fixed $ return channelHeaderResult borderWidget = vLimit maxHeight vBorder - render $ if appMode st == ChannelSelect + render $ if st^.csCurrentTeam.tsMode == ChannelSelect then headerWidget else hBox $ case st^.csChannelListOrientation of ChannelListLeft -> @@ -387,11 +394,11 @@ messages = padTop Max chatText - chatText = case appMode st of + chatText = case st^.csCurrentTeam.tsMode of MessageSelect -> - renderMessagesWithSelect (st^.csMessageSelect) channelMessages + renderMessagesWithSelect (st^.csCurrentTeam.tsMessageSelect) channelMessages MessageSelectDeleteConfirm -> - renderMessagesWithSelect (st^.csMessageSelect) channelMessages + renderMessagesWithSelect (st^.csCurrentTeam.tsMessageSelect) channelMessages _ -> cached (ChannelMessages cId) $ renderLastMessages st hs editCutoff $ @@ -422,15 +429,51 @@ cutoff = getNewMessageCutoff cId st editCutoff = getEditedMessageCutoff cId st + messageListing = getMessageListing cId st channelMessages = - insertTransitions (getMessageListing cId st) - cutoff - (getDateFormat st) - (st ^. timeZone) + -- If the channel is empty, add an informative message to the + -- message listing to make it explicit that this channel does + -- not yet have any messages. + if F.null messageListing + then addMessage (emptyChannelFillerMessage st cId) emptyDirSeq + else insertTransitions messageListing + cutoff + (getDateFormat st) + (st ^. timeZone) - cId = st^.csCurrentChannelId + tId = st^.csCurrentTeamId + cId = st^.(csCurrentChannelId tId) chan = st^.csCurrentChannel +-- | Construct a single message to be displayed in the specified channel +-- when it does not yet have any user messages posted to it. +emptyChannelFillerMessage :: ChatState -> ChannelId -> Message +emptyChannelFillerMessage st cId = + newMessageOfType msg (C Informative) ts + where + -- This is a bogus timestamp, but its value does not matter + -- because it is only used to create a message that will be + -- shown in a channel with no date transitions (which would + -- otherwise include this bogus date) or other messages (which + -- would make for a broken message sorting). + ts = ServerTime $ UTCTime (toEnum 0) 0 + Just chan = findChannelById cId (st^.csChannels) + chanName = mkChannelName st (chan^.ccInfo) + msg = case chan^.ccInfo.cdType of + Direct -> + let u = chan^.ccInfo.cdDMUserId >>= flip userById st + in case u of + Nothing -> userMsg Nothing + Just _ -> userMsg (Just chanName) + Group -> + groupMsg (chan^.ccInfo.cdDisplayName) + _ -> + chanMsg chanName + userMsg (Just cn) = "You have not yet sent any direct messages to " <> cn <> "." + userMsg Nothing = "You have not yet sent any direct messages to this user." + groupMsg us = "There are not yet any direct messages in the group " <> us <> "." + chanMsg cn = "There are not yet any messages in the " <> cn <> " channel." + getMessageListing :: ChannelId -> ChatState -> Messages getMessageListing cId st = st ^?! csChannels.folding (findChannelById cId) . ccContents . cdMessages . to (filterMessages isShown) @@ -456,7 +499,7 @@ renderChannelSelectPrompt :: ChatState -> Widget Name renderChannelSelectPrompt st = - let e = st^.csChannelSelectState.channelSelectInput + let e = st^.csCurrentTeam.tsChannelSelectState.channelSelectInput in withDefAttr channelSelectPromptAttr $ (txt "Switch to channel [use ^ and $ to anchor]: ") <+> (renderEditor (txt . T.concat) True e) @@ -470,6 +513,35 @@ , joinBorders $ mainInterface st ] +teamList :: ChatState -> Widget Name +teamList st = + let curTid = st^.csCurrentTeamId + z = st^.csTeamZipper + teams = (\tId -> st^.csTeam(tId)) <$> (concat $ snd <$> Z.toList z) + entries = mkEntry <$> teams + mkEntry ts = + let tId = teamId $ _tsTeam ts + unread = uCount > 0 + uCount = unreadCount tId + in (if tId == curTid + then visible . withDefAttr currentTeamAttr + else if unread + then withDefAttr unreadChannelAttr + else id) $ + txt $ + (T.strip $ sanitizeUserText $ teamDisplayName $ _tsTeam ts) + unreadCount tId = sum $ fmap (nonDMChannelListGroupUnread . fst) $ + Z.toList $ st^.csTeam(tId).tsFocus + in if length teams == 1 + then emptyWidget + else vBox [ hBox [ padRight (Pad 1) $ txt "Teams:" + , vLimit 1 $ viewport TeamList Horizontal $ + hBox $ + intersperse (txt " ") entries + ] + , hBorder + ] + connectionLayer :: ChatState -> Widget Name connectionLayer st = case st^.csConnectionStatus of @@ -504,7 +576,7 @@ hasVerb = isJust (findVerbatimChunk (postMsg^.mText)) -- make sure these keybinding pieces are up-to-date! ev e = - let keyconf = st^.csResources.crConfiguration.to configUserKeys + let keyconf = st^.csResources.crConfiguration.configUserKeysL KeyHandlerMap keymap = messageSelectKeybindings keyconf in T.intercalate "," [ ppBinding (eventToBinding k) @@ -575,21 +647,22 @@ , hBorder ] -maybePreviewViewport :: Widget Name -> Widget Name -maybePreviewViewport w = +maybePreviewViewport :: TeamId -> Widget Name -> Widget Name +maybePreviewViewport tId w = Widget Greedy Fixed $ do result <- render w case (Vty.imageHeight $ result^.imageL) > previewMaxHeight of False -> return result True -> - render $ vLimit previewMaxHeight $ viewport MessagePreviewViewport Vertical $ + render $ vLimit previewMaxHeight $ viewport (MessagePreviewViewport tId) Vertical $ (Widget Fixed Fixed $ return result) inputPreview :: ChatState -> HighlightSet -> Widget Name -inputPreview st hs | not $ st^.csShowMessagePreview = emptyWidget +inputPreview st hs | not $ st^.csResources.crConfiguration.configShowMessagePreviewL = emptyWidget | otherwise = thePreview where uId = myUserId st + tId = st^.csCurrentTeamId -- Insert a cursor sentinel into the input text just before -- rendering the preview. We use the inserted sentinel (which is -- not rendered) to get brick to ensure that the line the cursor is @@ -600,12 +673,12 @@ -- end of whatever line the user is editing, that is very unlikely -- to be a problem. curContents = getText $ (gotoEOL >>> insertChar cursorSentinel) $ - st^.csEditState.cedEditor.editContentsL + st^.csCurrentTeam.tsEditState.cedEditor.editContentsL curStr = T.intercalate "\n" curContents - overrideTy = case st^.csEditState.cedEditMode of + overrideTy = case st^.csCurrentTeam.tsEditState.cedEditMode of Editing _ ty -> Just ty _ -> Nothing - baseUrl = serverBaseUrl st + baseUrl = serverBaseUrl st tId previewMsg = previewFromInput baseUrl overrideTy uId curStr thePreview = let noPreview = str "(No preview)" msgPreview = case previewMsg of @@ -629,12 +702,12 @@ , mdMyUsername = myUsername st , mdWrapNonhighlightedCodeBlocks = True } - in (maybePreviewViewport msgPreview) <=> + in (maybePreviewViewport tId msgPreview) <=> hBorderWithLabel (withDefAttr clientEmphAttr $ str "[Preview ↑]") userInputArea :: ChatState -> HighlightSet -> Widget Name userInputArea st hs = - case appMode st of + case st^.csCurrentTeam.tsMode of ChannelSelect -> renderChannelSelectPrompt st UrlSelect -> hCenter $ hBox [ txt "Press " , withDefAttr clientEmphAttr $ txt "Enter" @@ -651,13 +724,13 @@ mainInterface :: ChatState -> Widget Name mainInterface st = - vBox [ body - , bottomBorder - , inputPreview st hs - , userInputArea st hs + vBox [ teamList st + , body ] where - body = if st^.csShowChannelList || appMode st == ChannelSelect + showChannelList = st^.csResources.crConfiguration.configShowChannelListL || + st^.csCurrentTeam.tsMode == ChannelSelect + body = if showChannelList then case st^.csChannelListOrientation of ChannelListLeft -> hBox [channelList, vBorder, mainDisplay] @@ -667,11 +740,17 @@ channelList = hLimit channelListWidth (renderChannelList st) hs = getHighlightSet st channelListWidth = configChannelListWidth $ st^.csResources.crConfiguration - mainDisplay = case appMode st of + mainDisplay = + vBox [ channelContents + , bottomBorder + , inputPreview st hs + , userInputArea st hs + ] + channelContents = case st^.csCurrentTeam.tsMode of UrlSelect -> renderUrlList st _ -> maybeSubdue $ renderCurrentChannelDisplay st hs - bottomBorder = case appMode st of + bottomBorder = case st^.csCurrentTeam.tsMode of MessageSelect -> messageSelectBottomBar st _ -> maybeSubdue $ hBox [ showAttachmentCount @@ -681,7 +760,7 @@ ] showAttachmentCount = - let count = length $ listElements $ st^.csEditState.cedAttachmentList + let count = length $ listElements $ st^.csCurrentTeam.tsEditState.cedAttachmentList in if count == 0 then emptyWidget else hBox [ borderElem bsHorizontal @@ -709,7 +788,7 @@ Just Nothing -> hLimit 2 hBorder <+> txt "*" Nothing -> emptyWidget - maybeSubdue = if appMode st == ChannelSelect + maybeSubdue = if st^.csCurrentTeam.tsMode == ChannelSelect then forceAttr "" else id diff --git a/src/Matterhorn/Draw/ManageAttachments.hs b/src/Matterhorn/Draw/ManageAttachments.hs --- a/src/Matterhorn/Draw/ManageAttachments.hs +++ b/src/Matterhorn/Draw/ManageAttachments.hs @@ -23,7 +23,7 @@ drawManageAttachments st = topLayer where - topLayer = case appMode st of + topLayer = case st^.csCurrentTeam.tsMode of ManageAttachments -> drawAttachmentList st ManageAttachmentsBrowseFiles -> drawFileBrowser st _ -> error "BUG: drawManageAttachments called in invalid mode" @@ -39,7 +39,7 @@ vLimit 15 $ joinBorders $ borderWithLabel (withDefAttr clientEmphAttr $ txt "Attachments") $ - vBox [ renderList renderAttachmentItem True (st^.csEditState.cedAttachmentList) + vBox [ renderList renderAttachmentItem True (st^.csCurrentTeam.tsEditState.cedAttachmentList) , hBorder , hCenter $ withDefAttr clientMessageAttr $ txt $ addBinding <> ":add " <> @@ -61,4 +61,4 @@ -- invariant: cedFileBrowser is not Nothing if appMode is -- ManageAttachmentsBrowseFiles, and that is the only way to reach -- this code, ergo the fromJust. - FB.renderFileBrowser True $ fromJust (st^.csEditState.cedFileBrowser) + FB.renderFileBrowser True $ fromJust (st^.csCurrentTeam.tsEditState.cedFileBrowser) diff --git a/src/Matterhorn/Draw/Messages.hs b/src/Matterhorn/Draw/Messages.hs --- a/src/Matterhorn/Draw/Messages.hs +++ b/src/Matterhorn/Draw/Messages.hs @@ -1,9 +1,14 @@ +{-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE LambdaCase #-} {-# LANGUAGE MultiWayIf #-} module Matterhorn.Draw.Messages - ( nameForUserRef + ( MessageData(..) + , renderMessage + , nameForUserRef , renderSingleMessage , unsafeRenderMessageSelection , renderLastMessages + , addEllipsis ) where @@ -11,8 +16,18 @@ import Brick.Widgets.Border import Control.Monad.Trans.Reader ( withReaderT ) import qualified Data.Foldable as F -import qualified Graphics.Vty as Vty +import qualified Data.Map.Strict as Map +import qualified Data.Sequence as S +import Data.Sequence ( ViewL(..) + , ViewR(..) + , (|>) + , viewl + , viewr) +import qualified Data.Set as Set +import qualified Data.Text as T +import qualified Graphics.Vty as V import Lens.Micro.Platform ( (.~), to ) +import Network.Mattermost.Lenses ( postEditAtL, postCreateAtL ) import Network.Mattermost.Types ( ServerTime(..), userUsername ) import Prelude () import Matterhorn.Prelude @@ -21,6 +36,7 @@ import Matterhorn.Draw.RichText import Matterhorn.Themes import Matterhorn.Types +import Matterhorn.Types.RichText import Matterhorn.Types.DirectionalSeq maxMessageHeight :: Int @@ -124,23 +140,23 @@ upperHeight = targetHeight `div` 2 lowerHeight = targetHeight - upperHeight - lowerRender img (m, tState) = render1HLimit doMsgRender Vty.vertJoin targetHeight img tState m - upperRender img (m, tState) = render1HLimit doMsgRender (flip Vty.vertJoin) targetHeight img tState m + lowerRender img (m, tState) = render1HLimit doMsgRender V.vertJoin targetHeight img tState m + upperRender img (m, tState) = render1HLimit doMsgRender (flip V.vertJoin) targetHeight img tState m - lowerHalf <- foldM lowerRender Vty.emptyImage after - upperHalf <- foldM upperRender Vty.emptyImage before + lowerHalf <- foldM lowerRender V.emptyImage after + upperHalf <- foldM upperRender V.emptyImage before - let curHeight = Vty.imageHeight $ curMsgResult^.imageL - uncropped = upperHalf Vty.<-> curMsgResult^.imageL Vty.<-> lowerHalf - img = if | Vty.imageHeight lowerHalf < (lowerHeight - curHeight) -> - Vty.cropTop targetHeight uncropped - | Vty.imageHeight upperHalf < upperHeight -> - Vty.cropBottom targetHeight uncropped + let curHeight = V.imageHeight $ curMsgResult^.imageL + uncropped = upperHalf V.<-> curMsgResult^.imageL V.<-> lowerHalf + img = if | V.imageHeight lowerHalf < (lowerHeight - curHeight) -> + V.cropTop targetHeight uncropped + | V.imageHeight upperHalf < upperHeight -> + V.cropBottom targetHeight uncropped | otherwise -> - Vty.cropTop upperHeight upperHalf Vty.<-> curMsgResult^.imageL Vty.<-> + V.cropTop upperHeight upperHalf V.<-> curMsgResult^.imageL V.<-> (if curHeight < lowerHeight - then Vty.cropBottom (lowerHeight - curHeight) lowerHalf - else Vty.cropBottom lowerHeight lowerHalf) + then V.cropBottom (lowerHeight - curHeight) lowerHalf + else V.cropBottom lowerHeight lowerHalf) return $ emptyResult & imageL .~ img renderLastMessages :: ChatState @@ -159,51 +175,253 @@ isBelow m transition = m^.mDate > transition^.mDate - go :: Vty.Image -> DirectionalSeq Retrograde (Message, ThreadState) -> RenderM Name Vty.Image + go :: V.Image -> DirectionalSeq Retrograde (Message, ThreadState) -> RenderM Name V.Image go img ms | messagesLength ms == 0 = return img go img ms = do let Just (m, threadState) = messagesHead ms newMessagesAbove = maybe False (isBelow m) newMessageTransition - newImg <- render1HLimit doMsgRender (flip Vty.vertJoin) targetHeight img threadState m + newImg <- render1HLimit doMsgRender (flip V.vertJoin) targetHeight img threadState m -- If the new message fills the window, check whether -- there is still a "New Messages" transition that is -- not displayed. If there is, then we need to replace -- the top line of the new image with a "New Messages" -- indicator. - if Vty.imageHeight newImg >= targetHeight && newMessagesAbove + if V.imageHeight newImg >= targetHeight && newMessagesAbove then do transitionResult <- render $ withDefAttr newMessageTransitionAttr $ hBorderWithLabel (txt "New Messages ↑") - let newImg2 = Vty.vertJoin (transitionResult^.imageL) - (Vty.cropTop (targetHeight - 1) newImg) + let newImg2 = V.vertJoin (transitionResult^.imageL) + (V.cropTop (targetHeight - 1) newImg) return newImg2 else go newImg $ messagesDrop 1 ms - img <- go Vty.emptyImage msgs - return $ emptyResult & imageL .~ (Vty.cropTop targetHeight img) + img <- go V.emptyImage msgs + return $ emptyResult & imageL .~ (V.cropTop targetHeight img) relaxHeight :: Context -> Context relaxHeight c = c & availHeightL .~ (max maxMessageHeight (c^.availHeightL)) render1HLimit :: (Message -> ThreadState -> Widget Name) - -> (Vty.Image -> Vty.Image -> Vty.Image) + -> (V.Image -> V.Image -> V.Image) -> Int - -> Vty.Image + -> V.Image -> ThreadState -> Message - -> RenderM Name Vty.Image + -> RenderM Name V.Image render1HLimit doMsgRender fjoin lim img threadState msg - | Vty.imageHeight img >= lim = return img + | V.imageHeight img >= lim = return img | otherwise = fjoin img <$> render1 doMsgRender threadState msg render1 :: (Message -> ThreadState -> Widget Name) -> ThreadState -> Message - -> RenderM Name Vty.Image + -> RenderM Name V.Image render1 doMsgRender threadState msg = case msg^.mDeleted of - True -> return Vty.emptyImage + True -> return V.emptyImage False -> do r <- withReaderT relaxHeight $ render $ padRight Max $ doMsgRender msg threadState return $ r^.imageL + +-- | A bundled structure that includes all the information necessary +-- to render a given message +data MessageData = + MessageData { mdEditThreshold :: Maybe ServerTime + -- ^ If specified, any messages edited before this point + -- in time are not indicated as edited. + , mdShowOlderEdits :: Bool + -- ^ Indicates whether "edited" markers should be shown + -- for old messages (i.e., ignore the mdEditThreshold + -- value). + , mdShowReactions :: Bool + -- ^ Whether to render reactions. + , mdMessage :: Message + -- ^ The message to render. + , mdUserName :: Maybe Text + -- ^ The username of the message's author, if any. This + -- is passed here rather than obtaining from the message + -- because we need to do lookups in the ChatState to + -- compute this, and we don't pass the ChatState into + -- renderMessage. + , mdParentMessage :: Maybe Message + -- ^ The parent message of this message, if any. + , mdParentUserName :: Maybe Text + -- ^ The author of the parent message, if any. + , mdThreadState :: ThreadState + -- ^ The thread state of this message. + , mdRenderReplyParent :: Bool + -- ^ Whether to render the parent message. + , mdHighlightSet :: HighlightSet + -- ^ The highlight set to use to highlight usernames, + -- channel names, etc. + , mdIndentBlocks :: Bool + -- ^ Whether to indent the message underneath the + -- author's name (True) or just display it to the right + -- of the author's name (False). + , mdMessageWidthLimit :: Maybe Int + -- ^ A width override to use to wrap non-code blocks + -- and code blocks without syntax highlighting. If + -- unspecified, all blocks in the message will be + -- wrapped and truncated at the width specified by the + -- rendering context. If specified, all non-code blocks + -- will be wrapped at this width and highlighted code + -- blocks will be rendered using the context's width. + , mdMyUsername :: Text + -- ^ The username of the user running Matterhorn. + , mdWrapNonhighlightedCodeBlocks :: Bool + -- ^ Whether to wrap text in non-highlighted code + -- blocks. + } + +-- | renderMessage performs markdown rendering of the specified message. +renderMessage :: MessageData -> Widget Name +renderMessage md@MessageData { mdMessage = msg, .. } = + let msgUsr = case mdUserName of + Just u -> if omittedUsernameType (msg^.mType) then Nothing else Just u + Nothing -> Nothing + botElem = if isBotMessage msg then txt "[BOT]" else emptyWidget + nameElems = case msgUsr of + Just un + | isEmote msg -> + [ withDefAttr pinnedMessageIndicatorAttr $ txt $ if msg^.mPinned then "[PIN]" else "" + , txt $ (if msg^.mFlagged then "[!] " else "") <> "*" + , colorUsername mdMyUsername un un + , botElem + , txt " " + ] + | otherwise -> + [ withDefAttr pinnedMessageIndicatorAttr $ txt $ if msg^.mPinned then "[PIN] " else "" + , colorUsername mdMyUsername un un + , botElem + , txt $ (if msg^.mFlagged then "[!]" else "") <> ": " + ] + Nothing -> [] + + -- Use the editing threshold to determine whether to append an + -- editing indication to this message. + maybeAugment bs = case msg^.mOriginalPost of + Nothing -> bs + Just p -> + if p^.postEditAtL > p^.postCreateAtL + then case mdEditThreshold of + Just cutoff | p^.postEditAtL >= cutoff -> + addEditSentinel (EEditSentinel True) bs + _ -> if mdShowOlderEdits + then addEditSentinel (EEditSentinel False) bs + else bs + else bs + + augmentedText = unBlocks $ maybeAugment $ msg^.mText + msgWidget = + vBox $ (layout mdHighlightSet mdMessageWidthLimit nameElems augmentedText . viewl) augmentedText : + catMaybes [msgAtch, msgReac] + replyIndent = Widget Fixed Fixed $ do + ctx <- getContext + -- NB: The amount subtracted here must be the total padding + -- added below (pad 1 + vBorder) + w <- render $ hLimit (ctx^.availWidthL - 2) msgWidget + render $ vLimit (V.imageHeight $ w^.imageL) $ + padRight (Pad 1) vBorder <+> (Widget Fixed Fixed $ return w) + msgAtch = if S.null (msg^.mAttachments) + then Nothing + else Just $ withDefAttr clientMessageAttr $ vBox + [ txt (" [attached: `" <> a^.attachmentName <> "`]") + | a <- toList (msg^.mAttachments) + ] + msgReac = if Map.null (msg^.mReactions) || (not mdShowReactions) + then Nothing + else let renderR e us = + let n = Set.size us + in if | n == 1 -> " [" <> e <> "]" + | n > 1 -> " [" <> e <> " " <> T.pack (show n) <> "]" + | otherwise -> "" + reactionMsg = Map.foldMapWithKey renderR (msg^.mReactions) + in Just $ withDefAttr emojiAttr $ txt (" " <> reactionMsg) + withParent p = + case mdThreadState of + NoThread -> msgWidget + InThreadShowParent -> p <=> replyIndent + InThread -> replyIndent + in if not mdRenderReplyParent + then msgWidget + else case msg^.mInReplyToMsg of + NotAReply -> msgWidget + InReplyTo _ -> + case mdParentMessage of + Nothing -> withParent (str "[loading...]") + Just pm -> + let parentMsg = renderMessage md + { mdShowOlderEdits = False + , mdMessage = pm + , mdUserName = mdParentUserName + , mdParentMessage = Nothing + , mdRenderReplyParent = False + , mdIndentBlocks = False + } + in withParent (addEllipsis $ forceAttr replyParentAttr parentMsg) + + where + layout :: HighlightSet -> Maybe Int -> [Widget Name] -> Seq Block + -> ViewL Block -> Widget Name + layout hs w nameElems bs xs | length xs > 1 = multiLnLayout hs w nameElems bs + layout hs w nameElems bs (Blockquote {} :< _) = multiLnLayout hs w nameElems bs + layout hs w nameElems bs (CodeBlock {} :< _) = multiLnLayout hs w nameElems bs + layout hs w nameElems bs (HTMLBlock {} :< _) = multiLnLayout hs w nameElems bs + layout hs w nameElems bs (List {} :< _) = multiLnLayout hs w nameElems bs + layout hs w nameElems bs (Para inlns :< _) + | F.any breakCheck (unInlines inlns) = multiLnLayout hs w nameElems bs + layout hs w nameElems bs _ = nameNextToMessage hs w nameElems bs + + multiLnLayout hs w nameElems bs = + if mdIndentBlocks + then vBox [ hBox nameElems + , hBox [txt " ", renderRichText mdMyUsername hs ((subtract 2) <$> w) + mdWrapNonhighlightedCodeBlocks (Blocks bs)] + ] + else nameNextToMessage hs w nameElems bs + + nameNextToMessage hs w nameElems bs = + Widget Fixed Fixed $ do + nameResult <- render $ hBox nameElems + let newW = subtract (V.imageWidth (nameResult^.imageL)) <$> w + render $ hBox [ raw (nameResult^.imageL) + , renderRichText mdMyUsername hs newW mdWrapNonhighlightedCodeBlocks (Blocks bs) + ] + + breakCheck i = i `elem` [ELineBreak, ESoftBreak] + +-- Add the edit sentinel to the end of the last block in the sequence. +-- If the last block is a paragraph, append it to that paragraph. +-- Otherwise, append a new block so it appears beneath the last +-- block-level element. +addEditSentinel :: Inline -> Blocks -> Blocks +addEditSentinel d (Blocks bs) = + case viewr bs of + EmptyR -> Blocks bs + (rest :> b) -> Blocks rest <> appendEditSentinel d b + +appendEditSentinel :: Inline -> Block -> Blocks +appendEditSentinel sentinel b = + let s = Para (Inlines $ S.singleton sentinel) + in Blocks $ case b of + Para is -> S.singleton $ Para (Inlines $ unInlines is |> ESpace |> sentinel) + _ -> S.fromList [b, s] + +omittedUsernameType :: MessageType -> Bool +omittedUsernameType = \case + CP Join -> True + CP Leave -> True + CP TopicChange -> True + _ -> False + +addEllipsis :: Widget a -> Widget a +addEllipsis w = Widget (hSize w) (vSize w) $ do + ctx <- getContext + let aw = ctx^.availWidthL + result <- render w + let withEllipsis = (hLimit (aw - 3) $ vLimit 1 $ (Widget Fixed Fixed $ return result)) <+> + str "..." + if (V.imageHeight (result^.imageL) > 1) || (V.imageWidth (result^.imageL) == aw) then + render withEllipsis else + return result diff --git a/src/Matterhorn/Draw/NotifyPrefs.hs b/src/Matterhorn/Draw/NotifyPrefs.hs --- a/src/Matterhorn/Draw/NotifyPrefs.hs +++ b/src/Matterhorn/Draw/NotifyPrefs.hs @@ -19,7 +19,7 @@ drawNotifyPrefs :: ChatState -> Widget Name drawNotifyPrefs st = - let Just form = st^.csNotifyPrefs + let Just form = st^.csCurrentTeam.tsNotifyPrefs label = forceAttr clientEmphAttr $ str "Notification Preferences" formKeys = withDefAttr clientEmphAttr <$> txt <$> ["Tab", "BackTab"] bindings = vBox $ hCenter <$> [ renderKeybindingHelp "Save" [FormSubmitEvent] <+> txt " " <+> diff --git a/src/Matterhorn/Draw/PostListOverlay.hs b/src/Matterhorn/Draw/PostListOverlay.hs --- a/src/Matterhorn/Draw/PostListOverlay.hs +++ b/src/Matterhorn/Draw/PostListOverlay.hs @@ -54,7 +54,7 @@ else " (" <> (T.pack . show . length) messages <> "): " <> terms messages = insertDateMarkers - (filterMessages knownChannel $ st^.csPostListOverlay.postListPosts) + (filterMessages knownChannel $ st^.csCurrentTeam.tsPostListOverlay.postListPosts) (getDateFormat st) (st^.timeZone) @@ -100,7 +100,7 @@ -- The full message list, rendered with the current selection renderedMessageList = let (s, (before, after)) = splitDirSeqOn matchesMessage messagesWithStates - matchesMessage (m, _) = m^.mMessageId == (MessagePostId <$> st^.csPostListOverlay.postListSelected) + matchesMessage (m, _) = m^.mMessageId == (MessagePostId <$> st^.csCurrentTeam.tsPostListOverlay.postListSelected) messagesWithStates = (, InThreadShowParent) <$> messages in case s of Nothing -> diff --git a/src/Matterhorn/Draw/ReactionEmojiListOverlay.hs b/src/Matterhorn/Draw/ReactionEmojiListOverlay.hs --- a/src/Matterhorn/Draw/ReactionEmojiListOverlay.hs +++ b/src/Matterhorn/Draw/ReactionEmojiListOverlay.hs @@ -17,7 +17,7 @@ drawReactionEmojiListOverlay :: ChatState -> Widget Name drawReactionEmojiListOverlay st = - let overlay = drawListOverlay (st^.csReactionEmojiListOverlay) + let overlay = drawListOverlay (st^.csCurrentTeam.tsReactionEmojiListOverlay) (const $ txt "Search Emoji") (const $ txt "No matching emoji found.") (const $ txt "Search emoji:") diff --git a/src/Matterhorn/Draw/RichText.hs b/src/Matterhorn/Draw/RichText.hs --- a/src/Matterhorn/Draw/RichText.hs +++ b/src/Matterhorn/Draw/RichText.hs @@ -1,17 +1,11 @@ -{-# LANGUAGE LambdaCase #-} {-# LANGUAGE MultiWayIf #-} {-# LANGUAGE ViewPatterns #-} {-# LANGUAGE ParallelListComp #-} -{-# LANGUAGE RecordWildCards #-} module Matterhorn.Draw.RichText - ( MessageData(..) - , renderRichText - , renderMessage + ( renderRichText , renderText , renderText' - , renderElementSeq , cursorSentinel - , addEllipsis , findVerbatimChunk ) where @@ -20,286 +14,67 @@ import Matterhorn.Prelude import Brick ( (<+>), Widget, hLimit, imageL - , raw, render, Size(..), Widget(..) + , render, Size(..), Widget(..) ) import qualified Brick as B import qualified Brick.Widgets.Border as B import qualified Brick.Widgets.Skylighting as BS import Control.Monad.Reader import qualified Data.Foldable as F -import qualified Data.Map.Strict as Map -import qualified Data.Sequence as Seq +import qualified Data.Sequence as S import Data.Sequence ( ViewL(..) - , ViewR(..) , (<|) - , (|>) , viewl - , viewr) -import qualified Data.Sequence as S -import qualified Data.Set as Set + ) import qualified Data.Text as T import qualified Graphics.Vty as V import qualified Skylighting.Core as Sky -import Network.Mattermost.Lenses ( postEditAtL, postCreateAtL ) -import Network.Mattermost.Types ( ServerTime(..), PostId ) - -import Matterhorn.Constants ( normalChannelSigil, userSigil ) +import Matterhorn.Constants ( normalChannelSigil, userSigil, editMarking ) +import Matterhorn.Draw.RichText.Flatten +import Matterhorn.Draw.RichText.Wrap import Matterhorn.Themes -import Matterhorn.Types ( Name, HighlightSet(..) ) -import Matterhorn.Types.Messages -import Matterhorn.Types.Posts +import Matterhorn.Types ( HighlightSet(..), emptyHSet ) import Matterhorn.Types.RichText -emptyHSet :: HighlightSet -emptyHSet = HighlightSet Set.empty Set.empty mempty - -omittedUsernameType :: MessageType -> Bool -omittedUsernameType = \case - CP Join -> True - CP Leave -> True - CP TopicChange -> True - _ -> False - --- Add the edit sentinel to the end of the last block in the sequence. --- If the last block is a paragraph, append it to that paragraph. --- Otherwise, append a new block so it appears beneath the last --- block-level element. -addEditSentinel :: ElementData -> Seq RichTextBlock -> Seq RichTextBlock -addEditSentinel d bs = - case viewr bs of - EmptyR -> bs - (rest :> b) -> rest <> appendEditSentinel d b - -appendEditSentinel :: ElementData -> RichTextBlock -> Seq RichTextBlock -appendEditSentinel sentinel b = - let s = Para (S.singleton m) - m = Element Normal sentinel - in case b of - Para is -> S.singleton $ Para (is |> Element Normal ESpace |> m) - _ -> S.fromList [b, s] - --- | A bundled structure that includes all the information necessary --- to render a given message -data MessageData = - MessageData { mdEditThreshold :: Maybe ServerTime - -- ^ If specified, any messages edited before this point - -- in time are not indicated as edited. - , mdShowOlderEdits :: Bool - -- ^ Indicates whether "edited" markers should be shown - -- for old messages (i.e., ignore the mdEditThreshold - -- value). - , mdShowReactions :: Bool - -- ^ Whether to render reactions. - , mdMessage :: Message - -- ^ The message to render. - , mdUserName :: Maybe Text - -- ^ The username of the message's author, if any. This - -- is passed here rather than obtaining from the message - -- because we need to do lookups in the ChatState to - -- compute this, and we don't pass the ChatState into - -- renderMessage. - , mdParentMessage :: Maybe Message - -- ^ The parent message of this message, if any. - , mdParentUserName :: Maybe Text - -- ^ The author of the parent message, if any. - , mdThreadState :: ThreadState - -- ^ The thread state of this message. - , mdRenderReplyParent :: Bool - -- ^ Whether to render the parent message. - , mdHighlightSet :: HighlightSet - -- ^ The highlight set to use to highlight usernames, - -- channel names, etc. - , mdIndentBlocks :: Bool - -- ^ Whether to indent the message underneath the - -- author's name (True) or just display it to the right - -- of the author's name (False). - , mdMessageWidthLimit :: Maybe Int - -- ^ A width override to use to wrap non-code blocks - -- and code blocks without syntax highlighting. If - -- unspecified, all blocks in the message will be - -- wrapped and truncated at the width specified by the - -- rendering context. If specified, all non-code blocks - -- will be wrapped at this width and highlighted code - -- blocks will be rendered using the context's width. - , mdMyUsername :: Text - -- ^ The username of the user running Matterhorn. - , mdWrapNonhighlightedCodeBlocks :: Bool - -- ^ Whether to wrap text in non-highlighted code - -- blocks. - } - --- | renderMessage performs markdown rendering of the specified message. -renderMessage :: MessageData -> Widget Name -renderMessage md@MessageData { mdMessage = msg, .. } = - let msgUsr = case mdUserName of - Just u -> if omittedUsernameType (msg^.mType) then Nothing else Just u - Nothing -> Nothing - botElem = if isBotMessage msg then B.txt "[BOT]" else B.emptyWidget - nameElems = case msgUsr of - Just un - | isEmote msg -> - [ B.withDefAttr pinnedMessageIndicatorAttr $ B.txt $ if msg^.mPinned then "[PIN]" else "" - , B.txt $ (if msg^.mFlagged then "[!] " else "") <> "*" - , colorUsername mdMyUsername un un - , botElem - , B.txt " " - ] - | otherwise -> - [ B.withDefAttr pinnedMessageIndicatorAttr $ B.txt $ if msg^.mPinned then "[PIN] " else "" - , colorUsername mdMyUsername un un - , botElem - , B.txt $ (if msg^.mFlagged then "[!]" else "") <> ": " - ] - Nothing -> [] - - -- Use the editing threshold to determine whether to append an - -- editing indication to this message. - maybeAugment bs = case msg^.mOriginalPost of - Nothing -> bs - Just p -> - if p^.postEditAtL > p^.postCreateAtL - then case mdEditThreshold of - Just cutoff | p^.postEditAtL >= cutoff -> - addEditSentinel (EEditSentinel True) bs - _ -> if mdShowOlderEdits - then addEditSentinel (EEditSentinel False) bs - else bs - else bs - - augmentedText = maybeAugment $ msg^.mText - msgWidget = - vBox $ (layout mdHighlightSet mdMessageWidthLimit nameElems augmentedText . viewl) augmentedText : - catMaybes [msgAtch, msgReac] - replyIndent = B.Widget B.Fixed B.Fixed $ do - ctx <- B.getContext - -- NB: The amount subtracted here must be the total padding - -- added below (pad 1 + vBorder) - w <- B.render $ B.hLimit (ctx^.B.availWidthL - 2) msgWidget - B.render $ B.vLimit (V.imageHeight $ w^.B.imageL) $ - B.padRight (B.Pad 1) B.vBorder B.<+> (B.Widget B.Fixed B.Fixed $ return w) - msgAtch = if Seq.null (msg^.mAttachments) - then Nothing - else Just $ B.withDefAttr clientMessageAttr $ vBox - [ B.txt (" [attached: `" <> a^.attachmentName <> "`]") - | a <- toList (msg^.mAttachments) - ] - msgReac = if Map.null (msg^.mReactions) || (not mdShowReactions) - then Nothing - else let renderR e us = - let n = Set.size us - in if | n == 1 -> " [" <> e <> "]" - | n > 1 -> " [" <> e <> " " <> T.pack (show n) <> "]" - | otherwise -> "" - reactionMsg = Map.foldMapWithKey renderR (msg^.mReactions) - in Just $ B.withDefAttr emojiAttr $ B.txt (" " <> reactionMsg) - withParent p = - case mdThreadState of - NoThread -> msgWidget - InThreadShowParent -> p B.<=> replyIndent - InThread -> replyIndent - in if not mdRenderReplyParent - then msgWidget - else case msg^.mInReplyToMsg of - NotAReply -> msgWidget - InReplyTo _ -> - case mdParentMessage of - Nothing -> withParent (B.str "[loading...]") - Just pm -> - let parentMsg = renderMessage md - { mdShowOlderEdits = False - , mdMessage = pm - , mdUserName = mdParentUserName - , mdParentMessage = Nothing - , mdRenderReplyParent = False - , mdIndentBlocks = False - } - in withParent (addEllipsis $ B.forceAttr replyParentAttr parentMsg) - - where - layout :: HighlightSet -> Maybe Int -> [Widget Name] -> Seq RichTextBlock - -> ViewL RichTextBlock -> Widget Name - layout hs w nameElems bs xs | length xs > 1 = multiLnLayout hs w nameElems bs - layout hs w nameElems bs (Blockquote {} :< _) = multiLnLayout hs w nameElems bs - layout hs w nameElems bs (CodeBlock {} :< _) = multiLnLayout hs w nameElems bs - layout hs w nameElems bs (HTMLBlock {} :< _) = multiLnLayout hs w nameElems bs - layout hs w nameElems bs (List {} :< _) = multiLnLayout hs w nameElems bs - layout hs w nameElems bs (Para inlns :< _) - | F.any breakCheck inlns = multiLnLayout hs w nameElems bs - layout hs w nameElems bs _ = nameNextToMessage hs w nameElems bs - - multiLnLayout hs w nameElems bs = - if mdIndentBlocks - then vBox [ hBox nameElems - , hBox [B.txt " ", renderRichText mdMyUsername hs ((subtract 2) <$> w) mdWrapNonhighlightedCodeBlocks bs] - ] - else nameNextToMessage hs w nameElems bs - - nameNextToMessage hs w nameElems bs = - Widget Fixed Fixed $ do - nameResult <- render $ hBox nameElems - let newW = subtract (V.imageWidth (nameResult^.imageL)) <$> w - render $ hBox [raw (nameResult^.imageL), renderRichText mdMyUsername hs newW mdWrapNonhighlightedCodeBlocks bs] - - breakCheck e = eData e `elem` [ELineBreak, ESoftBreak] - -addEllipsis :: Widget a -> Widget a -addEllipsis w = B.Widget (B.hSize w) (B.vSize w) $ do - ctx <- B.getContext - let aw = ctx^.B.availWidthL - result <- B.render w - let withEllipsis = (B.hLimit (aw - 3) $ B.vLimit 1 $ (B.Widget B.Fixed B.Fixed $ return result)) <+> - B.str "..." - if (V.imageHeight (result^.B.imageL) > 1) || (V.imageWidth (result^.B.imageL) == aw) then - B.render withEllipsis else - return result - -- Cursor sentinel for tracking the user's cursor position in previews. cursorSentinel :: Char cursorSentinel = '‸' -- Render markdown with username highlighting -renderRichText :: Text -> HighlightSet -> Maybe Int -> Bool -> Seq RichTextBlock -> Widget a -renderRichText curUser hSet w wrap bs = +renderRichText :: Text -> HighlightSet -> Maybe Int -> Bool -> Blocks -> Widget a +renderRichText curUser hSet w doWrap (Blocks bs) = runReader (do - blocks <- mapM blockToWidget (addBlankLines bs) + blocks <- mapM renderBlock (addBlankLines bs) return $ B.vBox $ toList blocks) (DrawCfg { drawCurUser = curUser , drawHighlightSet = hSet , drawLineWidth = w - , drawDoLineWrapping = wrap + , drawDoLineWrapping = doWrap }) -- Add blank lines only between adjacent elements of the same type, to -- save space -addBlankLines :: Seq RichTextBlock -> Seq RichTextBlock +addBlankLines :: Seq Block -> Seq Block addBlankLines = go' . viewl where go' EmptyL = S.empty go' (x :< xs) = go x (viewl xs) - go a@Para {} (b@Para {} :< rs) = - a <| blank <| go b (viewl rs) - go a@Header {} (b@Header {} :< rs) = - a <| blank <| go b (viewl rs) - go a@Blockquote {} (b@Blockquote {} :< rs) = - a <| blank <| go b (viewl rs) - go a@List {} (b@List {} :< rs) = - a <| blank <| go b (viewl rs) - go a@CodeBlock {} (b@CodeBlock {} :< rs) = - a <| blank <| go b (viewl rs) - go a@HTMLBlock {} (b@HTMLBlock {} :< rs) = - a <| blank <| go b (viewl rs) - go x (y :< rs) = x <| go y (viewl rs) - go x (EmptyL) = S.singleton x - blank = Para (S.singleton (Element Normal ESpace)) + go a (b :< rs) + | sameBlockType a b = a <| blank <| go b (viewl rs) + | otherwise = a <| go b (viewl rs) + go x EmptyL = S.singleton x + blank = Para (Inlines $ S.singleton ESpace) --- Render text to markdown without username highlighting or permalink detection +-- Render text to markdown without username highlighting or permalink +-- detection renderText :: Text -> Widget a renderText txt = renderText' Nothing "" emptyHSet txt renderText' :: Maybe TeamBaseURL -> Text -> HighlightSet -> Text -> Widget a -renderText' baseUrl curUser hSet t = renderRichText curUser hSet Nothing True rtBs - where rtBs = parseMarkdown baseUrl t +renderText' baseUrl curUser hSet t = + renderRichText curUser hSet Nothing True $ + parseMarkdown baseUrl t vBox :: F.Foldable f => f (Widget a) -> Widget a vBox = B.vBox . toList @@ -323,38 +98,38 @@ , drawDoLineWrapping :: Bool } -blockToWidget :: RichTextBlock -> M (Widget a) -blockToWidget (Para is) = - toElementChunk is -blockToWidget (Header n is) = do +renderBlock :: Block -> M (Widget a) +renderBlock (Para is) = + renderInlines is +renderBlock (Header n is) = do headerTxt <- withReader (\c -> c { drawLineWidth = subtract 1 <$> drawLineWidth c }) $ - toElementChunk is + renderInlines is return $ B.withDefAttr clientHeaderAttr $ hBox [ B.padRight (B.Pad 1) $ header n , headerTxt ] -blockToWidget (Blockquote is) = do +renderBlock (Blockquote bs) = do w <- asks drawLineWidth - bs <- mapM blockToWidget is - return $ maybeHLimit w $ addQuoting $ vBox bs -blockToWidget (List _ l bs) = do + bws <- mapM renderBlock (unBlocks bs) + return $ maybeHLimit w $ addQuoting $ vBox bws +renderBlock (List ty spacing bs) = do w <- asks drawLineWidth - lst <- blocksToList l bs + lst <- renderList ty spacing bs return $ maybeHLimit w lst -blockToWidget (CodeBlock ci tx) = do +renderBlock (CodeBlock ci tx) = do hSet <- asks drawHighlightSet - let f = maybe rawCodeBlockToWidget - (codeBlockToWidget (hSyntaxMap hSet)) + let f = maybe renderRawCodeBlock + (renderCodeBlock (hSyntaxMap hSet)) mSyntax mSyntax = do lang <- codeBlockLanguage ci Sky.lookupSyntax lang (hSyntaxMap hSet) f tx -blockToWidget (HTMLBlock t) = do +renderBlock (HTMLBlock t) = do w <- asks drawLineWidth return $ maybeHLimit w $ textWithCursor t -blockToWidget (HRule) = do +renderBlock (HRule) = do w <- asks drawLineWidth return $ maybeHLimit w $ B.vLimit 1 (B.fill '*') @@ -374,30 +149,30 @@ , B.Widget B.Fixed B.Fixed $ return childResult ] -codeBlockToWidget :: Sky.SyntaxMap -> Sky.Syntax -> Text -> M (Widget a) -codeBlockToWidget syntaxMap syntax tx = do +renderCodeBlock :: Sky.SyntaxMap -> Sky.Syntax -> Text -> M (Widget a) +renderCodeBlock syntaxMap syntax tx = do let result = Sky.tokenize cfg syntax tx cfg = Sky.TokenizerConfig syntaxMap False case result of - Left _ -> rawCodeBlockToWidget tx + Left _ -> renderRawCodeBlock tx Right tokLines -> do let padding = B.padLeftRight 1 (B.vLimit (length tokLines) B.vBorder) return $ (B.txt $ "[" <> Sky.sName syntax <> "]") B.<=> (padding <+> BS.renderRawSource textWithCursor tokLines) -rawCodeBlockToWidget :: Text -> M (Widget a) -rawCodeBlockToWidget tx = do - wrap <- asks drawDoLineWrapping +renderRawCodeBlock :: Text -> M (Widget a) +renderRawCodeBlock tx = do + doWrap <- asks drawDoLineWrapping - let hPolicy = if wrap then Greedy else Fixed + let hPolicy = if doWrap then Greedy else Fixed return $ B.withDefAttr codeAttr $ Widget hPolicy Fixed $ do c <- B.getContext let theLines = expandEmpty <$> T.lines tx expandEmpty "" = " " expandEmpty s = s - wrapFunc = if wrap then wrappedTextWithCursor - else textWithCursor + wrapFunc = if doWrap then wrappedTextWithCursor + else textWithCursor renderedText <- render (B.hLimit (c^.B.availWidthL - 3) $ B.vBox $ wrapFunc <$> theLines) @@ -406,8 +181,8 @@ render $ padding <+> (Widget Fixed Fixed $ return renderedText) -toElementChunk :: Seq Element -> M (Widget a) -toElementChunk es = do +renderInlines :: Inlines -> M (Widget a) +renderInlines es = do w <- asks drawLineWidth hSet <- asks drawHighlightSet curUser <- asks drawCurUser @@ -415,172 +190,68 @@ return $ B.Widget B.Fixed B.Fixed $ do ctx <- B.getContext let width = fromMaybe (ctx^.B.availWidthL) w - ws = fmap (renderElementSeq curUser) (wrapLine width hSet es) - B.render (vBox (fmap hBox ws)) + ws = fmap (renderWrappedLine curUser) $ + mconcat $ + (doLineWrapping width <$> (F.toList $ flattenInlineSeq hSet es)) + B.render (vBox ws) -blocksToList :: ListType -> Seq (Seq RichTextBlock) -> M (Widget a) -blocksToList lt bs = do - let is = case lt of - Bullet _ -> repeat ("• ") - Numbered Period s -> +renderList :: ListType -> ListSpacing -> Seq Blocks -> M (Widget a) +renderList ty _spacing bs = do + let is = case ty of + BulletList _ -> repeat ("• ") + OrderedList s _ Period -> [ T.pack (show (n :: Int)) <> ". " | n <- [s..] ] - Numbered Paren s -> + OrderedList s _ OneParen -> [ T.pack (show (n :: Int)) <> ") " | n <- [s..] ] + OrderedList s _ TwoParens -> + [ T.pack (show (n :: Int)) <> ")) " | n <- [s..] ] - results <- forM (zip is $ F.toList bs) $ \(i, b) -> do - blocks <- mapM blockToWidget b + results <- forM (zip is $ unBlocks <$> (F.toList bs)) $ \(i, b) -> do + blocks <- mapM renderBlock b return $ B.txt i <+> vBox blocks return $ vBox results -data SplitState = SplitState - { splitChunks :: Seq (Seq Element) - , splitCurrCol :: Int - } - -wrapLine :: Int -> HighlightSet -> Seq Element -> Seq (Seq Element) -wrapLine maxCols hSet = splitChunks . go (SplitState (S.singleton S.empty) 0) - where go st (viewl-> e :< es) = go st' es - where - HighlightSet { hUserSet = uSet, hChannelSet = cSet } = hSet - - -- Right before we check the width of the token, we see - -- if the token is a user or channel reference. If so, we - -- check if it is valid. If it is valid, we leave it in - -- place; otherwise we translate it into an ordinary text - -- element so that it does not render highlighted as a - -- valid user or channel reference. - newElement = e { eData = newEData } - newEData = case eData e of - EUser u -> - if u `Set.member` uSet - then EUser u - else EText $ userSigil <> u - EChannel c -> - if c `Set.member` cSet - then EChannel c - else EText $ normalChannelSigil <> c - d -> d - - addHyperlink url el = setElementStyle (Hyperlink url (eStyle el)) el - - linkOpenBracket = Element Normal (EText "<") - linkCloseBracket = Element Normal (EText ">") - addOpenBracket l = - case Seq.viewl l of - EmptyL -> l - h :< t -> - let h' = Element Normal - (ENonBreaking $ Seq.fromList [linkOpenBracket, h]) - in h' <| t - addCloseBracket l = - case Seq.viewr l of - EmptyR -> l - h :> t -> - let t' = Element Normal - (ENonBreaking $ Seq.fromList [t, linkCloseBracket]) - in h |> t' - decorateLinkLabel = addOpenBracket . addCloseBracket - - st' = - case newEData of - EHyperlink url (Just labelEs) -> - go st $ addHyperlink url <$> decorateLinkLabel labelEs - EHyperlink url Nothing -> - go st $ addHyperlink url <$> decorateLinkLabel (Seq.fromList [Element Normal $ EText $ unURL url]) - EPermalink _tName _pId (Just labelEs) -> - go st $ setElementStyle Permalink <$> decorateLinkLabel labelEs - EImage url (Just labelEs) -> - go st $ addHyperlink url <$> decorateLinkLabel labelEs - _ -> - if | newEData == ESoftBreak || newEData == ELineBreak -> - st { splitChunks = splitChunks st |> S.empty - , splitCurrCol = 0 - } - | available >= eWidth -> - st { splitChunks = addElement newElement (splitChunks st) - , splitCurrCol = splitCurrCol st + eWidth - } - | newEData == ESpace -> - st { splitChunks = splitChunks st |> S.empty - , splitCurrCol = 0 - } - | otherwise -> - st { splitChunks = splitChunks st |> S.singleton newElement - , splitCurrCol = eWidth - } - available = maxCols - splitCurrCol st - eWidth = elementWidth newElement - addElement x (viewr-> ls :> l) = ( ls |> (l |> x)) - addElement _ _ = error "[unreachable]" - go st _ = st - -renderElementSeq :: Text -> Seq Element -> Seq (Widget a) -renderElementSeq curUser es = renderElement curUser <$> es +renderWrappedLine :: Text -> WrappedLine -> Widget a +renderWrappedLine curUser l = hBox $ F.toList $ renderFlattenedValue curUser <$> l -renderElement :: Text -> Element -> Widget a -renderElement curUser e = addStyle sty widget +renderFlattenedValue :: Text -> FlattenedValue -> Widget a +renderFlattenedValue curUser (NonBreaking rs) = + let renderLine = hBox . F.toList . fmap (renderFlattenedValue curUser) + in vBox (F.toList $ renderLine <$> F.toList rs) +renderFlattenedValue curUser (SingleInline fi) = addHyperlink $ addStyles widget where - sty = eStyle e - dat = eData e - addStyle s = case s of - Normal -> id - Emph -> B.withDefAttr clientEmphAttr - Strikethrough -> B.withDefAttr strikeThroughAttr - Strong -> B.withDefAttr clientStrongAttr - Code -> B.withDefAttr codeAttr - Permalink -> B.withDefAttr permalinkAttr - Hyperlink (URL url) innerSty -> - B.hyperlink url . B.withDefAttr urlAttr . addStyle innerSty - rawText = B.txt . removeCursor - widget = case dat of - -- Cursor sentinels get parsed as individual text nodes by - -- Cheapskate, meaning that we get a text node with exactly - -- one character in it. That's why we compare accordingly - -- above. In addition, since that character has no width, we - -- have to replace it with something that has a size (such - -- as a space) to get Brick's visibility logic to scroll the - -- viewport to get it into view. - EText t -> if t == T.singleton (cursorSentinel) - then B.visible $ B.txt " " - else textWithCursor t - - ESpace -> B.txt " " - EPermalink _ pId mLabel -> drawPermalink curUser pId mLabel - ENonBreaking es -> hBox $ renderElement curUser <$> es - ERawHtml t -> textWithCursor t - EEditSentinel recent -> let attr = if recent - then editedRecentlyMarkingAttr - else editedMarkingAttr - in B.withDefAttr attr $ B.txt editMarking - EUser u -> colorUsername curUser u $ userSigil <> u - EChannel c -> B.withDefAttr channelNameAttr $ - B.txt $ normalChannelSigil <> c - EHyperlink (URL url) Nothing -> rawText url - EImage (URL url) Nothing -> rawText url - EEmoji em -> B.withDefAttr emojiAttr $ - B.txt $ ":" <> em <> ":" - - -- Hyperlink and image nodes with labels should not appear - -- at this point because line-wrapping should break them up - -- into normal text node sequences with hyperlink styles - -- attached. - EHyperlink {} -> rawText "(Report renderElement bug #1)" - EImage {} -> rawText "(Report renderElement bug #2)" + val = fiValue fi + mUrl = fiURL fi + styles = fiStyles fi - -- Line breaks should never need to get rendered since the - -- line-wrapping algorithm removes them. - ESoftBreak -> B.emptyWidget - ELineBreak -> B.emptyWidget + addStyles w = foldr addStyle w styles + addStyle s = + B.withDefAttr $ case s of + Strong -> clientStrongAttr + Code -> codeAttr + Permalink -> permalinkAttr + Strikethrough -> strikeThroughAttr + Emph -> clientEmphAttr -drawPermalink :: Text -> PostId -> Maybe (Seq Element) -> Widget a -drawPermalink _ _ Nothing = - B.txt permalinkPlaceholder -drawPermalink curUser _ (Just label) = - hBox $ F.toList $ B.txt "<" <| (renderElementSeq curUser label |> B.txt ">") + addHyperlink = case mUrl of + Nothing -> id + Just u -> B.withDefAttr urlAttr . B.hyperlink (unURL u) -permalinkPlaceholder :: Text -permalinkPlaceholder = "" + widget = case val of + FSpace -> B.txt " " + FUser u -> colorUsername curUser u $ userSigil <> u + FChannel c -> B.withDefAttr channelNameAttr $ + B.txt $ normalChannelSigil <> c + FEmoji em -> B.withDefAttr emojiAttr $ + B.txt $ ":" <> em <> ":" + FText t -> if t == T.singleton (cursorSentinel) + then B.visible $ B.txt " " + else textWithCursor t + FEditSentinel recent -> let attr = if recent + then editedRecentlyMarkingAttr + else editedMarkingAttr + in B.withDefAttr attr $ B.txt editMarking textWithCursor :: Text -> Widget a textWithCursor t @@ -594,26 +265,3 @@ removeCursor :: Text -> Text removeCursor = T.filter (/= cursorSentinel) - -editMarking :: Text -editMarking = "(edited)" - -elementWidth :: Element -> Int -elementWidth e = - case eData e of - ENonBreaking es -> sum $ elementWidth <$> es - EText t -> B.textWidth t - ERawHtml t -> B.textWidth t - EUser t -> T.length userSigil + B.textWidth t - EChannel t -> T.length normalChannelSigil + B.textWidth t - EEditSentinel _ -> B.textWidth editMarking - EImage (URL url) Nothing -> B.textWidth url - EImage _ (Just is) -> sum $ elementWidth <$> is - EHyperlink (URL url) Nothing -> B.textWidth url - EHyperlink _ (Just is) -> sum $ elementWidth <$> is - EEmoji t -> B.textWidth t + 2 - EPermalink _ _ Nothing -> T.length permalinkPlaceholder - EPermalink _ _ (Just label) -> 2 + (sum $ elementWidth <$> label) - ESpace -> 1 - ELineBreak -> 0 - ESoftBreak -> 0 diff --git a/src/Matterhorn/Draw/RichText/Flatten.hs b/src/Matterhorn/Draw/RichText/Flatten.hs new file mode 100644 --- /dev/null +++ b/src/Matterhorn/Draw/RichText/Flatten.hs @@ -0,0 +1,302 @@ +-- | This module implements a "flattening" pass over RichText 'Inline' +-- values. This means that a tree structure such as +-- +-- @ +-- EStrong +-- [ EStrikethrough +-- [ EText "inside" +-- ] +-- , EText "outside" +-- ] +-- @ +-- +-- will be converted into a "flat" representation without a tree +-- structure so that the style information encoded in the tree is +-- available at each node: +-- +-- @ +-- [ +-- [ SingleInline (FlattenedInline (FText "inside") [Strong, Strikethrough] Nothing +-- , SingleInline (FlattenedInline (FText "outside") [Strong] Nothing +-- ] +-- ] +-- @ +-- +-- The outer sequence is a sequence of lines (since inline lists can +-- introduce line breaks). Each inner sequence is a single line. +-- Each 'SingleInline' can be rendered as-is; if a 'NonBreaking' is +-- encountered, that group of inlines should be treated as a unit for +-- the purposes of line-wrapping (to happen in the Wrap module). The +-- above representation example shows how the tree path including the +-- 'EStrong' and 'EStrikethrough' nodes is flattened into a list of +-- styles to accompany each inline value. This makes it trivial to carry +-- that style information along with each node during line-wrapping +-- rather than needing to deal with the tree structure. +module Matterhorn.Draw.RichText.Flatten + ( FlattenedContent(..) + , FlattenedInline(..) + , InlineStyle(..) + , FlattenedValue(..) + , flattenInlineSeq + ) +where + +import Prelude () +import Matterhorn.Prelude + +import Control.Monad.Reader +import Control.Monad.State +import Data.List ( nub ) +import qualified Data.Sequence as Seq +import Data.Sequence ( ViewL(..) + , ViewR(..) + , (<|) + , (|>) + ) +import qualified Data.Set as Set +import qualified Data.Text as T + +import Matterhorn.Constants ( normalChannelSigil, userSigil ) +import Matterhorn.Types ( HighlightSet(..) ) +import Matterhorn.Types.RichText + + +-- | A piece of text in a sequence of flattened RichText elements. This +-- type represents the lowest-level kind of data that we can get from a +-- rich text document. +data FlattenedContent = + FText Text + -- ^ Some text + | FSpace + -- ^ A space + | FUser Text + -- ^ A user reference + | FChannel Text + -- ^ A channel reference + | FEmoji Text + -- ^ An emoji + | FEditSentinel Bool + -- ^ An "edited" marking + deriving (Eq, Show) + +-- | A flattened inline value. +data FlattenedInline = + FlattenedInline { fiValue :: FlattenedContent + -- ^ The content of the value. + , fiStyles :: [InlineStyle] + -- ^ The styles that should be applied to this + -- value. + , fiURL :: Maybe URL + -- ^ If present, the URL to which we should + -- hyperlink this value. + } + deriving (Show) + +-- | A flattened value. +data FlattenedValue = + SingleInline FlattenedInline + -- ^ A single flattened value + | NonBreaking (Seq (Seq FlattenedValue)) + -- ^ A sequence of flattened values that MUST be kept together and + -- never broken up by line-wrapping + deriving (Show) + +-- | The visual styles of inline values. +data InlineStyle = + Strong + | Emph + | Strikethrough + | Code + | Permalink + deriving (Eq, Show) + +type FlattenM a = ReaderT FlattenEnv (State FlattenState) a + +-- | The flatten monad state +data FlattenState = + FlattenState { fsCompletedLines :: Seq (Seq FlattenedValue) + -- ^ The lines that we have accumulated so far in the + -- flattening process + , fsCurLine :: Seq FlattenedValue + -- ^ The current line we are accumulating in the + -- flattening process + } + +-- | The flatten monad environment +data FlattenEnv = + FlattenEnv { flattenStyles :: [InlineStyle] + -- ^ The styles that should apply to the current value + -- being flattened + , flattenURL :: Maybe URL + -- ^ The hyperlink URL, if any, that should be applied to + -- the current value being flattened + , flattenHighlightSet :: HighlightSet + -- ^ The highlight set to use to check for valid user or + -- channel references + } + +-- | Given a sequence of inlines, flatten it into a list of lines of +-- flattened values. +-- +-- The flattening process also validates user and channel references +-- against a 'HighlightSet'. For example, if an 'EUser' node is found, +-- its username argument is looked up in the 'HighlightSet'. If the +-- username is found, the 'EUser' node is preserved as an 'FUser' node. +-- Otherwise it is rewritten as an 'FText' node so that the username +-- does not get highlighted. Channel references ('EChannel') are handled +-- similarly. +flattenInlineSeq :: HighlightSet -> Inlines -> Seq (Seq FlattenedValue) +flattenInlineSeq hs is = + flattenInlineSeq' initialEnv is + where + initialEnv = FlattenEnv { flattenStyles = [] + , flattenURL = Nothing + , flattenHighlightSet = hs + } + +flattenInlineSeq' :: FlattenEnv -> Inlines -> Seq (Seq FlattenedValue) +flattenInlineSeq' env is = + fsCompletedLines $ execState stBody initialState + where + initialState = FlattenState mempty mempty + stBody = runReaderT body env + body = do + mapM_ flatten $ unInlines is + pushFLine + +withInlineStyle :: InlineStyle -> FlattenM () -> FlattenM () +withInlineStyle s = + withReaderT (\e -> e { flattenStyles = nub (s : flattenStyles e) }) + +withHyperlink :: URL -> FlattenM () -> FlattenM () +withHyperlink u = withReaderT (\e -> e { flattenURL = Just u }) + +-- | Push a FlattenedContent value onto the current line. +pushFC :: FlattenedContent -> FlattenM () +pushFC v = do + env <- ask + let styles = flattenStyles env + mUrl = flattenURL env + fi = FlattenedInline { fiValue = v + , fiStyles = styles + , fiURL = mUrl + } + pushFV $ SingleInline fi + +-- | Push a FlattenedValue onto the current line. +pushFV :: FlattenedValue -> FlattenM () +pushFV fv = lift $ modify $ \s -> s { fsCurLine = appendFV fv (fsCurLine s) } + +-- | Append the value to the sequence. +-- +-- If the both the value to append AND the sequence's last value are +-- both text nodes, AND if those nodes both have the same style and URL +-- metadata, then merge them into one text node. This keeps adjacent +-- non-whitespace text together as one logical token (e.g. "(foo" rather +-- than "(" followed by "foo") to avoid undesirable line break points in +-- the wrapping process. +appendFV :: FlattenedValue -> Seq FlattenedValue -> Seq FlattenedValue +appendFV v line = + case (Seq.viewr line, v) of + (h :> SingleInline a, SingleInline b) -> + case (fiValue a, fiValue b) of + (FText aT, FText bT) -> + if fiStyles a == fiStyles b && fiURL a == fiURL b + then h |> SingleInline (FlattenedInline (FText $ aT <> bT) + (fiStyles a) + (fiURL a)) + else line |> v + _ -> line |> v + _ -> line |> v + +-- | Push the current line onto the finished lines list and start a new +-- line. +pushFLine :: FlattenM () +pushFLine = + lift $ modify $ \s -> s { fsCompletedLines = fsCompletedLines s |> fsCurLine s + , fsCurLine = mempty + } + +isKnownUser :: T.Text -> FlattenM Bool +isKnownUser u = do + hSet <- asks flattenHighlightSet + let uSet = hUserSet hSet + return $ u `Set.member` uSet + +isKnownChannel :: T.Text -> FlattenM Bool +isKnownChannel c = do + hSet <- asks flattenHighlightSet + let cSet = hChannelSet hSet + return $ c `Set.member` cSet + +flatten :: Inline -> FlattenM () +flatten i = + case i of + EUser u -> do + known <- isKnownUser u + if known then pushFC (FUser u) + else pushFC (FText $ userSigil <> u) + EChannel c -> do + known <- isKnownChannel c + if known then pushFC (FChannel c) + else pushFC (FText $ normalChannelSigil <> c) + + ENonBreaking is -> do + env <- ask + pushFV $ (NonBreaking $ flattenInlineSeq' env is) + + ESoftBreak -> pushFLine + ELineBreak -> pushFLine + + EText t -> pushFC $ FText t + ESpace -> pushFC FSpace + ERawHtml h -> pushFC $ FText h + EEmoji e -> pushFC $ FEmoji e + EEditSentinel r -> pushFC $ FEditSentinel r + + EEmph es -> withInlineStyle Emph $ mapM_ flatten $ unInlines es + EStrikethrough es -> withInlineStyle Strikethrough $ mapM_ flatten $ unInlines es + EStrong es -> withInlineStyle Strong $ mapM_ flatten $ unInlines es + ECode es -> withInlineStyle Code $ mapM_ flatten $ unInlines es + + EPermalink _ _ mLabel -> + let label' = fromMaybe (Inlines $ Seq.fromList [EText "post", ESpace, EText "link"]) + mLabel + in withInlineStyle Permalink $ mapM_ flatten $ unInlines $ decorateLinkLabel label' + + EHyperlink u label@(Inlines ls) -> + let label' = if Seq.null ls + then Inlines $ Seq.singleton $ EText $ unURL u + else label + in withHyperlink u $ mapM_ flatten $ unInlines $ decorateLinkLabel label' + + EImage u label@(Inlines ls) -> + let label' = if Seq.null ls + then Inlines $ Seq.singleton $ EText $ unURL u + else label + in withHyperlink u $ mapM_ flatten $ unInlines $ decorateLinkLabel label' + +linkOpenBracket :: Inline +linkOpenBracket = EText "<" + +linkCloseBracket :: Inline +linkCloseBracket = EText ">" + +addOpenBracket :: Inlines -> Inlines +addOpenBracket (Inlines l) = + case Seq.viewl l of + EmptyL -> Inlines l + h :< t -> + let h' = ENonBreaking $ Inlines $ Seq.fromList [linkOpenBracket, h] + in Inlines $ h' <| t + +addCloseBracket :: Inlines -> Inlines +addCloseBracket (Inlines l) = + case Seq.viewr l of + EmptyR -> Inlines l + h :> t -> + let t' = ENonBreaking $ Inlines $ Seq.fromList [t, linkCloseBracket] + in Inlines $ h |> t' + +decorateLinkLabel :: Inlines -> Inlines +decorateLinkLabel = addOpenBracket . addCloseBracket diff --git a/src/Matterhorn/Draw/RichText/Wrap.hs b/src/Matterhorn/Draw/RichText/Wrap.hs new file mode 100644 --- /dev/null +++ b/src/Matterhorn/Draw/RichText/Wrap.hs @@ -0,0 +1,116 @@ +-- | This module performs line-wrapping of sequences of flattend inline +-- values produced by 'flattenInlineSeq'. +-- +-- This process works by maintaining a 'WrapState' in the 'WrapM' +-- monad, where inline values are pushed onto the current line, and +-- line breaks are introduced as inlines exceed the available width. +-- The most important caveat of this module is that wrapping depends +-- on knowing the width of each 'FlattenedValue', which is provided +-- by the 'fvWidth' function. But 'fvWidth' must return values that +-- are consistent with the how the inlines actually get rendered by +-- 'renderFlattenedValue'. This is because there are visual aspects to +-- how some inlines get rendered that are implicit, such as user or +-- channel sigils that get added at drawing time, that have an impact on +-- their visible width. +module Matterhorn.Draw.RichText.Wrap + ( WrappedLine + , doLineWrapping + ) +where + +import Prelude () +import Matterhorn.Prelude + +import qualified Brick as B +import Control.Monad.State +import qualified Data.Sequence as Seq +import Data.Sequence ( ViewL(..) + , (|>) + ) +import qualified Data.Text as T + +import Matterhorn.Constants ( normalChannelSigil, userSigil ) +import Matterhorn.Draw.RichText.Flatten +import Matterhorn.Constants ( editMarking ) + + +type WrappedLine = Seq FlattenedValue + +data WrapState = + WrapState { wrapCompletedLines :: Seq WrappedLine + -- ^ The completed lines so far + , wrapCurLine :: WrappedLine + -- ^ The current line we are accumulating + , wrapCurCol :: Int + -- ^ The width of wrapCurLine, in columns + , wrapWidth :: Int + -- ^ The maximum allowable width + } + +type WrapM a = State WrapState a + +-- | Push a flattened value onto the current line if possible, or add a +-- line break and add the inline value to a new line if it would cause +-- the current line width to exceed the maximum. +pushValue :: FlattenedValue -> WrapM () +pushValue i = do + let iw = fvWidth i + pushThisInline = + modify $ \st -> st { wrapCurLine = wrapCurLine st |> i + , wrapCurCol = wrapCurCol st + iw + } + maxWidth <- gets wrapWidth + curWidth <- gets wrapCurCol + let remaining = maxWidth - curWidth + + when (iw > remaining) pushLine + + pushThisInline + +-- | Insert a new line break by moving the current accumulating line +-- onto the completed lines list and resetting it to empty. +pushLine :: WrapM () +pushLine = do + let trimLeadingWhitespace s = + case Seq.viewl s of + SingleInline i :< t | fiValue i == FSpace -> trimLeadingWhitespace t + _ -> s + + modify $ \st -> + st { wrapCurLine = mempty + , wrapCompletedLines = wrapCompletedLines st |> trimLeadingWhitespace (wrapCurLine st) + , wrapCurCol = 0 + } + +-- | Given a maximum width and an inline sequence, produce a sequence of +-- lines wrapped at the specified column. This only returns lines longer +-- than the maximum width when those lines have a single inline value +-- that cannot be broken down further (such as a long URL). +doLineWrapping :: Int -> Seq FlattenedValue -> Seq WrappedLine +doLineWrapping maxCols i = + result + where + result = wrapCompletedLines $ execState (mapM_ pushValue i >> pushLine) initialState + initialState = WrapState { wrapCurLine = mempty + , wrapCompletedLines = mempty + , wrapCurCol = 0 + , wrapWidth = maxCols + } + +-- The widths returned by this function must match the content widths +-- rendered by renderFlattenedValue. +fvWidth :: FlattenedValue -> Int +fvWidth (SingleInline fi) = fiWidth fi +fvWidth (NonBreaking rs) = sum $ (sum . fmap fvWidth) <$> rs + +-- The widths returned by this function must match the content widths +-- rendered by renderFlattenedValue. +fiWidth :: FlattenedInline -> Int +fiWidth fi = + case fiValue fi of + FText t -> B.textWidth t + FSpace -> 1 + FUser t -> T.length userSigil + B.textWidth t + FChannel t -> T.length normalChannelSigil + B.textWidth t + FEmoji t -> B.textWidth t + 2 + FEditSentinel _ -> B.textWidth editMarking diff --git a/src/Matterhorn/Draw/ShowHelp.hs b/src/Matterhorn/Draw/ShowHelp.hs --- a/src/Matterhorn/Draw/ShowHelp.hs +++ b/src/Matterhorn/Draw/ShowHelp.hs @@ -443,14 +443,14 @@ [ ("Global Keybindings", globalKeyHandlers) , ("Help Page", helpKeyHandlers) , ("Main Interface", mainKeyHandlers) - , ("Text Editing", editingKeyHandlers (csEditState.cedEditor)) + , ("Text Editing", editingKeyHandlers (csCurrentTeam.tsEditState.cedEditor)) , ("Channel Select Mode", channelSelectKeyHandlers) , ("Message Select Mode", messageSelectKeyHandlers) , ("User Listings", userListOverlayKeyHandlers) , ("URL Select Mode", urlSelectKeyHandlers) , ("Theme List Window", themeListOverlayKeyHandlers) , ("Channel Search Window", channelListOverlayKeyHandlers) - , ("Message Viewer: Common", tabbedWindowKeyHandlers (csViewedMessage.singular _Just._2)) + , ("Message Viewer: Common", tabbedWindowKeyHandlers (csCurrentTeam.tsViewedMessage.singular _Just._2)) , ("Message Viewer: Message tab", viewMessageKeyHandlers) , ("Message Viewer: Reactions tab", viewMessageReactionsKeyHandlers) , ("Attachment List", attachmentListKeyHandlers) @@ -502,7 +502,7 @@ in (label, rendering) mkKeybindEventSectionHelp :: KeyConfig - -> ((Either Text Text, Text, [Text]) -> a) + -> ((TextHunk, Text, [TextHunk]) -> a) -> ([a] -> a) -> (Text -> a) -> (Text, [KeyEventHandler]) @@ -511,53 +511,59 @@ vertCat $ (mkHeading sectionName) : (mkKeybindHelpFunc <$> (mkKeybindEventHelp kc <$> kbs)) -keybindEventHelpWidget :: (Either Text Text, Text, [Text]) -> Widget Name +data TextHunk = Verbatim Text + | Comment Text + +keybindEventHelpWidget :: (TextHunk, Text, [TextHunk]) -> Widget Name keybindEventHelpWidget (evName, desc, evs) = - let evText = T.intercalate ", " evs + let evText = T.intercalate ", " (getText <$> evs) + getText (Comment s) = s + getText (Verbatim s) = s label = case evName of - Left s -> txt $ "; " <> s - Right s -> emph $ txt s + Comment s -> txt $ "; " <> s + Verbatim s -> emph $ txt s in padBottom (Pad 1) $ vBox [ txtWrap ("; " <> desc) , label <+> txt (" = " <> evText) ] -keybindEventHelpMarkdown :: (Either Text Text, Text, [Text]) -> Text +keybindEventHelpMarkdown :: (TextHunk, Text, [TextHunk]) -> Text keybindEventHelpMarkdown (evName, desc, evs) = let quote s = "`" <> s <> "`" + format (Comment s) = s + format (Verbatim s) = quote s name = case evName of - Left s -> s - Right s -> quote s - in "| " <> (T.intercalate ", " $ quote <$> evs) <> + Comment s -> s + Verbatim s -> quote s + in "| " <> (T.intercalate ", " $ format <$> evs) <> " | " <> name <> " | " <> desc <> " |" -keybindEventHelpText :: Int -> Int -> (Either Text Text, Text, [Text]) -> Text +keybindEventHelpText :: Int -> Int -> (TextHunk, Text, [TextHunk]) -> Text keybindEventHelpText width eventNameWidth (evName, desc, evs) = - let name = case evName of - Left s -> s - Right s -> s - in padTo width (T.intercalate ", " evs) <> " " <> - padTo eventNameWidth name <> " " <> + let getText (Comment s) = s + getText (Verbatim s) = s + in padTo width (T.intercalate ", " $ getText <$> evs) <> " " <> + padTo eventNameWidth (getText evName) <> " " <> desc -mkKeybindEventHelp :: KeyConfig -> KeyEventHandler -> (Either Text Text, Text, [Text]) +mkKeybindEventHelp :: KeyConfig -> KeyEventHandler -> (TextHunk, Text, [TextHunk]) mkKeybindEventHelp kc h = let trig = kehEventTrigger h - unbound = ["(unbound)"] + unbound = [Comment "(unbound)"] (label, evText) = case trig of - Static key -> (Left "(non-customizable key)", [ppBinding $ eventToBinding key]) + Static key -> (Comment "(non-customizable key)", [Verbatim $ ppBinding $ eventToBinding key]) ByEvent ev -> case M.lookup ev kc of Nothing -> let name = keyEventName ev in if not (null (defaultBindings ev)) - then (Right name, ppBinding <$> defaultBindings ev) - else (Left name, unbound) - Just Unbound -> (Right $ keyEventName ev, unbound) - Just (BindingList bs) -> (Right $ keyEventName ev, + then (Verbatim name, Verbatim <$> ppBinding <$> defaultBindings ev) + else (Verbatim name, unbound) + Just Unbound -> (Verbatim $ keyEventName ev, unbound) + Just (BindingList bs) -> (Verbatim $ keyEventName ev, if not (null bs) - then ppBinding <$> bs + then Verbatim <$> ppBinding <$> bs else unbound ) in (label, ehDescription $ kehHandler h, evText) diff --git a/src/Matterhorn/Draw/TabbedWindow.hs b/src/Matterhorn/Draw/TabbedWindow.hs --- a/src/Matterhorn/Draw/TabbedWindow.hs +++ b/src/Matterhorn/Draw/TabbedWindow.hs @@ -12,6 +12,8 @@ import Data.List ( intersperse ) import qualified Graphics.Vty as Vty +import Network.Mattermost.Types ( TeamId ) + import Matterhorn.Draw.Util ( renderKeybindingHelp ) import Matterhorn.Types import Matterhorn.Themes @@ -26,12 +28,13 @@ let cur = getCurrentTabbedWindowEntry w tabBody = tweRender cur (twValue w) cs title = forceAttr clientEmphAttr $ twtTitle (twTemplate w) (tweValue cur) + tId = cs^.csCurrentTeamId in centerLayer $ vLimit (twWindowHeight w) $ hLimit (twWindowWidth w) $ joinBorders $ borderWithLabel title $ - (tabBar w <=> tabBody <=> hBorder <=> hCenter keybindingHelp) + (tabBar tId w <=> tabBody <=> hBorder <=> hCenter keybindingHelp) -- | Keybinding help to show at the bottom of a tabbed window. keybindingHelp :: Widget Name @@ -43,9 +46,10 @@ -- | The scrollable tab bar to show at the top of a tabbed window. tabBar :: (Eq a, Show a) - => TabbedWindow a + => TeamId + -> TabbedWindow a -> Widget Name -tabBar w = +tabBar tId w = let cur = getCurrentTabbedWindowEntry w entries = twtEntries (twTemplate w) renderEntry e = @@ -74,4 +78,4 @@ render $ hBox $ (intersperse divider $ renderEntry <$> entries) <> [divider, padTop (Pad 1) $ hLimit width hBorder] divider = vLimit 1 vBorder <=> joinableBorder (Edges True False False False) - in vLimit 2 $ viewport TabbedWindowTabBar Horizontal contents + in vLimit 2 $ viewport (TabbedWindowTabBar tId) Horizontal contents diff --git a/src/Matterhorn/Draw/ThemeListOverlay.hs b/src/Matterhorn/Draw/ThemeListOverlay.hs --- a/src/Matterhorn/Draw/ThemeListOverlay.hs +++ b/src/Matterhorn/Draw/ThemeListOverlay.hs @@ -23,7 +23,7 @@ drawThemeListOverlay :: ChatState -> Widget Name drawThemeListOverlay st = - let overlay = drawListOverlay (st^.csThemeListOverlay) + let overlay = drawListOverlay (st^.csCurrentTeam.tsThemeListOverlay) (const $ txt "Themes") (const $ txt "No matching themes found.") (const $ txt "Search built-in themes:") diff --git a/src/Matterhorn/Draw/URLList.hs b/src/Matterhorn/Draw/URLList.hs --- a/src/Matterhorn/Draw/URLList.hs +++ b/src/Matterhorn/Draw/URLList.hs @@ -9,6 +9,7 @@ import Brick import Brick.Widgets.Border ( hBorder ) import Brick.Widgets.List ( renderList ) +import qualified Data.Sequence as Seq import qualified Data.Foldable as F import Lens.Micro.Platform ( to ) @@ -19,7 +20,7 @@ import Matterhorn.Draw.RichText import Matterhorn.Themes import Matterhorn.Types -import Matterhorn.Types.RichText ( unURL, TeamURLName(..) ) +import Matterhorn.Types.RichText renderUrlList :: ChatState -> Widget Name @@ -35,10 +36,12 @@ then str "No URLs found in this channel." else renderList renderItem True urls - urls = st^.csUrlList + urls = st^.csCurrentTeam.tsUrlList me = myUsername st + hSet = getHighlightSet st + renderItem sel link = let time = link^.linkTime in attr sel $ vLimit 2 $ @@ -47,7 +50,11 @@ in colorUsername me u u , case link^.linkLabel of Nothing -> emptyWidget - Just label -> txt ": " <+> hBox (F.toList $ renderElementSeq me label) + Just label -> + case Seq.null (unInlines label) of + True -> emptyWidget + False -> txt ": " <+> renderRichText me hSet Nothing False + (Blocks $ Seq.singleton $ Para label) , fill ' ' , renderDate st $ withServerTime time , str " " diff --git a/src/Matterhorn/Draw/UserListOverlay.hs b/src/Matterhorn/Draw/UserListOverlay.hs --- a/src/Matterhorn/Draw/UserListOverlay.hs +++ b/src/Matterhorn/Draw/UserListOverlay.hs @@ -22,7 +22,7 @@ drawUserListOverlay :: ChatState -> Widget Name drawUserListOverlay st = - let overlay = drawListOverlay (st^.csUserListOverlay) userSearchScopeHeader + let overlay = drawListOverlay (st^.csCurrentTeam.tsUserListOverlay) userSearchScopeHeader userSearchScopeNoResults userSearchScopePrompt (renderUser (myUsername st)) Nothing diff --git a/src/Matterhorn/Draw/Util.hs b/src/Matterhorn/Draw/Util.hs --- a/src/Matterhorn/Draw/Util.hs +++ b/src/Matterhorn/Draw/Util.hs @@ -18,7 +18,6 @@ import Data.List ( intersperse ) import qualified Data.Set as Set import qualified Data.Text as T -import Lens.Micro.Platform ( to ) import Network.Mattermost.Types import Matterhorn.Constants ( userSigil, normalChannelSigil ) @@ -40,11 +39,11 @@ getTimeFormat :: ChatState -> Text getTimeFormat st = - maybe defaultTimeFormat id (st^.csResources.crConfiguration.to configTimeFormat) + maybe defaultTimeFormat id (st^.csResources.crConfiguration.configTimeFormatL) getDateFormat :: ChatState -> Text getDateFormat st = - maybe defaultDateFormat id (st^.csResources.crConfiguration.to configDateFormat) + maybe defaultDateFormat id (st^.csResources.crConfiguration.configDateFormatL) renderTime :: ChatState -> UTCTime -> Widget Name renderTime st = renderUTCTime (getTimeFormat st) (st^.timeZone) diff --git a/src/Matterhorn/Events.hs b/src/Matterhorn/Events.hs --- a/src/Matterhorn/Events.hs +++ b/src/Matterhorn/Events.hs @@ -9,30 +9,22 @@ import Matterhorn.Prelude import Brick -import qualified Data.Sequence as Seq -import qualified Data.Set as Set import qualified Data.Text as T import qualified Graphics.Vty as Vty -import Lens.Micro.Platform ( (.=), preuse, _2, singular, _Just ) +import Lens.Micro.Platform ( (.=), _2, singular, _Just ) import qualified Network.Mattermost.Endpoints as MM import Network.Mattermost.Exceptions ( mattermostErrorMessage ) -import Network.Mattermost.Lenses -import Network.Mattermost.Types -import Network.Mattermost.WebSocket import Matterhorn.Connection import Matterhorn.Constants ( userSigil, normalChannelSigil ) import Matterhorn.HelpTopics +import Matterhorn.State.ChannelList import Matterhorn.State.Channels import Matterhorn.State.Common -import Matterhorn.State.Flagging import Matterhorn.State.Help import Matterhorn.State.Messages -import Matterhorn.State.Reactions -import Matterhorn.State.Users import Matterhorn.Types -import Matterhorn.Types.Common import Matterhorn.Events.ChannelSelect import Matterhorn.Events.ChannelTopicWindow @@ -51,6 +43,7 @@ import Matterhorn.Events.TabbedWindow import Matterhorn.Events.ManageAttachments import Matterhorn.Events.EditNotifyPrefs +import Matterhorn.Events.Websocket onEvent :: ChatState -> BrickEvent Name MHEvent -> EventM Name (Next ChatState) @@ -102,9 +95,9 @@ onAppEvent (BGBusy n) = csWorkerIsBusy .= Just n onAppEvent (WSEvent we) = - handleWSEvent we + handleWebsocketEvent we onAppEvent (WSActionResponse r) = - handleWSActionResponse r + handleWebsocketActionResponse r onAppEvent (RespEvent f) = f onAppEvent (WebsocketParseError e) = do let msg = "A websocket message could not be parsed:\n " <> @@ -185,26 +178,31 @@ handleGlobalEvent :: Vty.Event -> MH () handleGlobalEvent e = do - mode <- gets appMode + mode <- use (csCurrentTeam.tsMode) + globalHandlerByMode mode e + +globalHandlerByMode :: Mode -> Vty.Event -> MH () +globalHandlerByMode mode = case mode of - Main -> onEventMain e - ShowHelp _ _ -> void $ onEventShowHelp e - ChannelSelect -> void $ onEventChannelSelect e - UrlSelect -> void $ onEventUrlSelect e - LeaveChannelConfirm -> onEventLeaveChannelConfirm e - MessageSelect -> onEventMessageSelect e - MessageSelectDeleteConfirm -> onEventMessageSelectDeleteConfirm e - DeleteChannelConfirm -> onEventDeleteChannelConfirm e - ThemeListOverlay -> onEventThemeListOverlay e - PostListOverlay _ -> onEventPostListOverlay e - UserListOverlay -> onEventUserListOverlay e - ChannelListOverlay -> onEventChannelListOverlay e - ReactionEmojiListOverlay -> onEventReactionEmojiListOverlay e - ViewMessage -> void $ handleTabbedWindowEvent (csViewedMessage.singular _Just._2) e - ManageAttachments -> onEventManageAttachments e - ManageAttachmentsBrowseFiles -> onEventManageAttachments e - EditNotifyPrefs -> void $ onEventEditNotifyPrefs e - ChannelTopicWindow -> onEventChannelTopicWindow e + Main -> onEventMain + ShowHelp _ _ -> void . onEventShowHelp + ChannelSelect -> void . onEventChannelSelect + UrlSelect -> void . onEventUrlSelect + LeaveChannelConfirm -> onEventLeaveChannelConfirm + MessageSelect -> onEventMessageSelect + MessageSelectDeleteConfirm -> onEventMessageSelectDeleteConfirm + DeleteChannelConfirm -> onEventDeleteChannelConfirm + ThemeListOverlay -> onEventThemeListOverlay + PostListOverlay _ -> onEventPostListOverlay + UserListOverlay -> onEventUserListOverlay + ChannelListOverlay -> onEventChannelListOverlay + ReactionEmojiListOverlay -> onEventReactionEmojiListOverlay + ViewMessage -> void . handleTabbedWindowEvent + (csCurrentTeam.tsViewedMessage.singular _Just._2) + ManageAttachments -> onEventManageAttachments + ManageAttachmentsBrowseFiles -> onEventManageAttachments + EditNotifyPrefs -> void . onEventEditNotifyPrefs + ChannelTopicWindow -> onEventChannelTopicWindow globalKeybindings :: KeyConfig -> KeyHandlerMap globalKeybindings = mkKeybindings globalKeyHandlers @@ -216,164 +214,6 @@ (showHelpScreen mainHelpTopic) ] -handleWSActionResponse :: WebsocketActionResponse -> MH () -handleWSActionResponse r = - case warStatus r of - WebsocketActionStatusOK -> return () - -handleWSEvent :: WebsocketEvent -> MH () -handleWSEvent we = do - myId <- gets myUserId - myTId <- gets myTeamId - case weEvent we of - WMPosted - | Just p <- wepPost (weData we) -> - when (wepTeamId (weData we) == Just myTId || - wepTeamId (weData we) == Nothing) $ do - let wasMentioned = maybe False (Set.member myId) $ wepMentions (weData we) - addNewPostedMessage $ RecentPost p wasMentioned - cId <- use csCurrentChannelId - when (postChannelId p /= cId) $ - showChannelInSidebar (p^.postChannelIdL) False - | otherwise -> return () - - WMPostEdited - | Just p <- wepPost (weData we) -> do - editMessage p - cId <- use csCurrentChannelId - when (postChannelId p == cId) (updateViewed False) - when (postChannelId p /= cId) $ - showChannelInSidebar (p^.postChannelIdL) False - | otherwise -> return () - - WMPostDeleted - | Just p <- wepPost (weData we) -> do - deleteMessage p - cId <- use csCurrentChannelId - when (postChannelId p == cId) (updateViewed False) - when (postChannelId p /= cId) $ - showChannelInSidebar (p^.postChannelIdL) False - | otherwise -> return () - - WMStatusChange - | Just status <- wepStatus (weData we) - , Just uId <- wepUserId (weData we) -> - setUserStatus uId status - | otherwise -> return () - - WMUserAdded - | Just cId <- webChannelId (weBroadcast we) -> - when (wepUserId (weData we) == Just myId && - wepTeamId (weData we) == Just myTId) $ - handleChannelInvite cId - | otherwise -> return () - - WMNewUser - | Just uId <- wepUserId $ weData we -> - handleNewUsers (Seq.singleton uId) (return ()) - | otherwise -> return () - - WMUserRemoved - | Just cId <- wepChannelId (weData we) -> - when (webUserId (weBroadcast we) == Just myId) $ - removeChannelFromState cId - | otherwise -> return () - - WMTyping - | Just uId <- wepUserId $ weData we - , Just cId <- webChannelId (weBroadcast we) -> handleTypingUser uId cId - | otherwise -> return () - - WMChannelDeleted - | Just cId <- wepChannelId (weData we) -> - when (webTeamId (weBroadcast we) == Just myTId) $ - removeChannelFromState cId - | otherwise -> return () - - WMDirectAdded - | Just cId <- webChannelId (weBroadcast we) -> handleChannelInvite cId - | otherwise -> return () - - -- An 'ephemeral message' is just Mattermost's version of our - -- 'client message'. This can be a little bit wacky, e.g. - -- if the user types '/shortcuts' in the browser, we'll get - -- an ephemeral message even in MatterHorn with the browser - -- shortcuts, but it's probably a good idea to handle these - -- messages anyway. - WMEphemeralMessage - | Just p <- wepPost $ weData we -> postInfoMessage (sanitizeUserText $ p^.postMessageL) - | otherwise -> return () - - WMPreferenceChanged - | Just prefs <- wepPreferences (weData we) -> - mapM_ applyPreferenceChange prefs - | otherwise -> return () - - WMPreferenceDeleted - | Just pref <- wepPreferences (weData we) - , Just fps <- mapM preferenceToFlaggedPost pref -> - forM_ fps $ \f -> - updateMessageFlag (flaggedPostId f) False - | otherwise -> return () - - WMReactionAdded - | Just r <- wepReaction (weData we) - , Just cId <- webChannelId (weBroadcast we) -> addReactions cId [r] - | otherwise -> return () - - WMReactionRemoved - | Just r <- wepReaction (weData we) - , Just cId <- webChannelId (weBroadcast we) -> removeReaction r cId - | otherwise -> return () - - WMChannelViewed - | Just cId <- wepChannelId $ weData we -> refreshChannelById cId - | otherwise -> return () - - WMChannelUpdated - | Just cId <- webChannelId $ weBroadcast we -> do - mChan <- preuse (csChannel(cId)) - when (isJust mChan) $ do - refreshChannelById cId - updateSidebar - | otherwise -> return () - - WMGroupAdded - | Just cId <- webChannelId (weBroadcast we) -> handleChannelInvite cId - | otherwise -> return () - - WMChannelMemberUpdated - | Just channelMember <- wepChannelMember $ weData we -> - when (channelMemberUserId channelMember == myId) $ - updateChannelNotifyProps - (channelMemberChannelId channelMember) - (channelMemberNotifyProps channelMember) - | otherwise -> return () - - -- We are pretty sure we should do something about these: - WMAddedToTeam -> return () - - -- We aren't sure whether there is anything we should do about - -- these yet: - WMUpdateTeam -> return () - WMTeamDeleted -> return () - WMUserUpdated -> return () - WMLeaveTeam -> return () - - -- We deliberately ignore these events: - WMChannelCreated -> return () - WMEmojiAdded -> return () - WMWebRTC -> return () - WMHello -> return () - WMAuthenticationChallenge -> return () - WMUserRoleUpdated -> return () - WMPluginStatusesChanged -> return () - WMPluginEnabled -> return () - WMPluginDisabled -> return () - WMUnknownEvent {} -> - mhLog LogWebsocket $ T.pack $ - "Websocket event not handled due to unknown event type: " <> show we - -- | Refresh client-accessible server configuration information. This -- is usually triggered when a reconnect event for the WebSocket to the -- server occurs. @@ -384,4 +224,4 @@ cfg <- MM.mmGetClientConfiguration (Just "old") session return $ Just $ do csClientConfig .= Just cfg - updateSidebar + updateSidebar Nothing diff --git a/src/Matterhorn/Events/ChannelListOverlay.hs b/src/Matterhorn/Events/ChannelListOverlay.hs --- a/src/Matterhorn/Events/ChannelListOverlay.hs +++ b/src/Matterhorn/Events/ChannelListOverlay.hs @@ -18,7 +18,7 @@ onEventChannelListOverlay :: Vty.Event -> MH () onEventChannelListOverlay = - void . onEventListOverlay csChannelListOverlay channelListOverlayKeybindings + void . onEventListOverlay (csCurrentTeam.tsChannelListOverlay) channelListOverlayKeybindings -- | The keybindings we want to use while viewing a channel list overlay channelListOverlayKeybindings :: KeyConfig -> KeyHandlerMap @@ -26,10 +26,10 @@ channelListOverlayKeyHandlers :: [KeyEventHandler] channelListOverlayKeyHandlers = - [ mkKb CancelEvent "Close the channel search list" (exitListOverlay csChannelListOverlay) + [ mkKb CancelEvent "Close the channel search list" (exitListOverlay (csCurrentTeam.tsChannelListOverlay)) , mkKb SearchSelectUpEvent "Select the previous channel" channelListSelectUp , mkKb SearchSelectDownEvent "Select the next channel" channelListSelectDown , mkKb PageDownEvent "Page down in the channel list" channelListPageDown , mkKb PageUpEvent "Page up in the channel list" channelListPageUp - , mkKb ActivateListItemEvent "Join the selected channel" (listOverlayActivateCurrent csChannelListOverlay) + , mkKb ActivateListItemEvent "Join the selected channel" (listOverlayActivateCurrent (csCurrentTeam.tsChannelListOverlay)) ] diff --git a/src/Matterhorn/Events/ChannelSelect.hs b/src/Matterhorn/Events/ChannelSelect.hs --- a/src/Matterhorn/Events/ChannelSelect.hs +++ b/src/Matterhorn/Events/ChannelSelect.hs @@ -17,9 +17,9 @@ onEventChannelSelect :: Vty.Event -> MH Bool onEventChannelSelect = handleKeyboardEvent channelSelectKeybindings $ \e -> do - handled <- handleKeyboardEvent (editingKeybindings (csChannelSelectState.channelSelectInput)) (const $ return ()) e + handled <- handleKeyboardEvent (editingKeybindings (csCurrentTeam.tsChannelSelectState.channelSelectInput)) (const $ return ()) e when (not handled) $ - mhHandleEventLensed (csChannelSelectState.channelSelectInput) handleEditorEvent e + mhHandleEventLensed (csCurrentTeam.tsChannelSelectState.channelSelectInput) handleEditorEvent e updateChannelSelectMatches @@ -30,7 +30,7 @@ channelSelectKeyHandlers = [ staticKb "Switch to selected channel" (Vty.EvKey Vty.KEnter []) $ do - matches <- use (csChannelSelectState.channelSelectMatches) + matches <- use (csCurrentTeam.tsChannelSelectState.channelSelectMatches) case Z.focus matches of Nothing -> return () Just match -> do diff --git a/src/Matterhorn/Events/ChannelTopicWindow.hs b/src/Matterhorn/Events/ChannelTopicWindow.hs --- a/src/Matterhorn/Events/ChannelTopicWindow.hs +++ b/src/Matterhorn/Events/ChannelTopicWindow.hs @@ -18,31 +18,31 @@ onEventChannelTopicWindow :: Vty.Event -> MH () onEventChannelTopicWindow (Vty.EvKey (Vty.KChar '\t') []) = - csChannelTopicDialog.channelTopicDialogFocus %= focusNext + csCurrentTeam.tsChannelTopicDialog.channelTopicDialogFocus %= focusNext onEventChannelTopicWindow (Vty.EvKey Vty.KBackTab []) = - csChannelTopicDialog.channelTopicDialogFocus %= focusPrev + csCurrentTeam.tsChannelTopicDialog.channelTopicDialogFocus %= focusPrev onEventChannelTopicWindow e@(Vty.EvKey Vty.KEnter []) = do - f <- use (csChannelTopicDialog.channelTopicDialogFocus) + f <- use (csCurrentTeam.tsChannelTopicDialog.channelTopicDialogFocus) case focusGetCurrent f of - Just ChannelTopicSaveButton -> do - ed <- use (csChannelTopicDialog.channelTopicDialogEditor) + Just (ChannelTopicSaveButton {}) -> do + ed <- use (csCurrentTeam.tsChannelTopicDialog.channelTopicDialogEditor) let topic = T.unlines $ getEditContents ed setChannelTopic topic setMode Main - Just ChannelTopicEditor -> - mhHandleEventLensed (csChannelTopicDialog.channelTopicDialogEditor) + Just (ChannelTopicEditor {}) -> + mhHandleEventLensed (csCurrentTeam.tsChannelTopicDialog.channelTopicDialogEditor) handleEditorEvent e - Just ChannelTopicCancelButton -> + Just (ChannelTopicCancelButton {}) -> setMode Main _ -> setMode Main onEventChannelTopicWindow (Vty.EvKey Vty.KEsc []) = do setMode Main onEventChannelTopicWindow e = do - f <- use (csChannelTopicDialog.channelTopicDialogFocus) + f <- use (csCurrentTeam.tsChannelTopicDialog.channelTopicDialogFocus) case focusGetCurrent f of - Just ChannelTopicEditor -> - mhHandleEventLensed (csChannelTopicDialog.channelTopicDialogEditor) + Just (ChannelTopicEditor {}) -> + mhHandleEventLensed (csCurrentTeam.tsChannelTopicDialog.channelTopicDialogEditor) handleEditorEvent e _ -> return () diff --git a/src/Matterhorn/Events/EditNotifyPrefs.hs b/src/Matterhorn/Events/EditNotifyPrefs.hs --- a/src/Matterhorn/Events/EditNotifyPrefs.hs +++ b/src/Matterhorn/Events/EditNotifyPrefs.hs @@ -25,9 +25,9 @@ onEventEditNotifyPrefs :: V.Event -> MH Bool onEventEditNotifyPrefs = let fallback e = do - form <- use (csNotifyPrefs.singular _Just) + form <- use (csCurrentTeam.tsNotifyPrefs.singular _Just) updatedForm <- mh $ handleFormEvent (VtyEvent e) form - csNotifyPrefs .= Just updatedForm + csCurrentTeam.tsNotifyPrefs .= Just updatedForm in handleKeyboardEvent editNotifyPrefsKeybindings fallback editNotifyPrefsKeybindings :: KeyConfig -> KeyHandlerMap @@ -38,8 +38,8 @@ [ mkKb CancelEvent "Close channel notification preferences" exitEditNotifyPrefsMode , mkKb FormSubmitEvent "Save channel notification preferences" $ do st <- use id - let form = fromJust $ st^.csNotifyPrefs - cId = st^.csCurrentChannelId + let form = fromJust $ st^.csCurrentTeam.tsNotifyPrefs + cId = st^.csCurrentChannelId(st^.csCurrentTeamId) doAsyncChannelMM Preempt cId (\s _ -> MM.mmUpdateChannelNotifications cId (myUserId st) (formState form) s) diff --git a/src/Matterhorn/Events/Keybindings.hs b/src/Matterhorn/Events/Keybindings.hs --- a/src/Matterhorn/Events/Keybindings.hs +++ b/src/Matterhorn/Events/Keybindings.hs @@ -226,6 +226,10 @@ EditorEndEvent -> [ kb Vty.KEnd ] EditorYankEvent -> [ ctrl (key 'y') ] FormSubmitEvent -> [ kb Vty.KEnter ] + NextTeamEvent -> [ ctrl (kb Vty.KRight) ] + PrevTeamEvent -> [ ctrl (kb Vty.KLeft) ] + MoveCurrentTeamLeftEvent -> [ ] + MoveCurrentTeamRightEvent -> [ ] -- | Given a configuration, we want to check it for internal consistency -- (i.e. that a given keybinding isn't associated with multiple events diff --git a/src/Matterhorn/Events/Main.hs b/src/Matterhorn/Events/Main.hs --- a/src/Matterhorn/Events/Main.hs +++ b/src/Matterhorn/Events/Main.hs @@ -11,10 +11,12 @@ import Matterhorn.Events.Keybindings import Matterhorn.State.Attachments import Matterhorn.State.ChannelSelect +import Matterhorn.State.ChannelList import Matterhorn.State.Channels import Matterhorn.State.Editing import Matterhorn.State.MessageSelect import Matterhorn.State.PostListOverlay ( enterFlaggedPostListMode ) +import Matterhorn.State.Teams import Matterhorn.State.UrlSelect import Matterhorn.Types @@ -50,6 +52,18 @@ , mkKb ToggleExpandedChannelTopicsEvent "Toggle display of expanded channel topics" toggleExpandedChannelTopics + , mkKb NextTeamEvent "Switch to the next available team" + nextTeam + + , mkKb PrevTeamEvent "Switch to the previous available team" + prevTeam + + , mkKb MoveCurrentTeamLeftEvent "Move the current team to the left in the team list" + moveCurrentTeamLeft + + , mkKb MoveCurrentTeamRightEvent "Move the current team to the right in the team list" + moveCurrentTeamRight + , mkKb InvokeEditorEvent "Invoke `$EDITOR` to edit the current message" @@ -78,9 +92,9 @@ "Scroll up in the channel input history" $ do -- Up in multiline mode does the usual thing; otherwise we -- navigate the history. - isMultiline <- use (csEditState.cedEphemeral.eesMultiline) + isMultiline <- use (csCurrentTeam.tsEditState.cedEphemeral.eesMultiline) case isMultiline of - True -> mhHandleEventLensed (csEditState.cedEditor) handleEditorEvent + True -> mhHandleEventLensed (csCurrentTeam.tsEditState.cedEditor) handleEditorEvent (Vty.EvKey Vty.KUp []) False -> channelHistoryBackward @@ -89,9 +103,9 @@ "Scroll down in the channel input history" $ do -- Down in multiline mode does the usual thing; otherwise -- we navigate the history. - isMultiline <- use (csEditState.cedEphemeral.eesMultiline) + isMultiline <- use (csCurrentTeam.tsEditState.cedEphemeral.eesMultiline) case isMultiline of - True -> mhHandleEventLensed (csEditState.cedEditor) handleEditorEvent + True -> mhHandleEventLensed (csCurrentTeam.tsEditState.cedEditor) handleEditorEvent (Vty.EvKey Vty.KDown []) False -> channelHistoryForward @@ -123,22 +137,24 @@ , staticKb "Send the current message" (Vty.EvKey Vty.KEnter []) $ do - isMultiline <- use (csEditState.cedEphemeral.eesMultiline) + isMultiline <- use (csCurrentTeam.tsEditState.cedEphemeral.eesMultiline) case isMultiline of -- Normally, this event causes the current message to -- be sent. But in multiline mode we want to insert a -- newline instead. True -> handleEditingInput (Vty.EvKey Vty.KEnter []) False -> do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) content <- getEditorContent - handleInputSubmission cId content + handleInputSubmission tId cId content , mkKb EnterOpenURLModeEvent "Select and open a URL posted to the current channel" startUrlSelect - , mkKb ClearUnreadEvent "Clear the current channel's unread / edited indicators" $ - clearChannelUnreadStatus =<< use csCurrentChannelId + , mkKb ClearUnreadEvent "Clear the current channel's unread / edited indicators" $ do + tId <- use csCurrentTeamId + clearChannelUnreadStatus =<< use (csCurrentChannelId tId) , mkKb ToggleMultiLineEvent "Toggle multi-line message compose mode" toggleMultilineEditing diff --git a/src/Matterhorn/Events/ManageAttachments.hs b/src/Matterhorn/Events/ManageAttachments.hs --- a/src/Matterhorn/Events/ManageAttachments.hs +++ b/src/Matterhorn/Events/ManageAttachments.hs @@ -30,7 +30,7 @@ onEventManageAttachments :: V.Event -> MH () onEventManageAttachments e = do - mode <- gets appMode + mode <- use (csCurrentTeam.tsMode) case mode of ManageAttachments -> void $ onEventAttachmentList e ManageAttachmentsBrowseFiles -> onEventBrowseFile e @@ -39,7 +39,7 @@ onEventAttachmentList :: V.Event -> MH Bool onEventAttachmentList = handleKeyboardEvent attachmentListKeybindings $ - mhHandleEventLensed (csEditState.cedAttachmentList) L.handleListEvent + mhHandleEventLensed (csCurrentTeam.tsEditState.cedAttachmentList) L.handleListEvent attachmentListKeybindings :: KeyConfig -> KeyHandlerMap attachmentListKeybindings = mkKeybindings attachmentListKeyHandlers @@ -49,9 +49,9 @@ [ mkKb CancelEvent "Close attachment list" (setMode Main) , mkKb SelectUpEvent "Move cursor up" $ - mhHandleEventLensed (csEditState.cedAttachmentList) L.handleListEvent (V.EvKey V.KUp []) + mhHandleEventLensed (csCurrentTeam.tsEditState.cedAttachmentList) L.handleListEvent (V.EvKey V.KUp []) , mkKb SelectDownEvent "Move cursor down" $ - mhHandleEventLensed (csEditState.cedAttachmentList) L.handleListEvent (V.EvKey V.KDown []) + mhHandleEventLensed (csCurrentTeam.tsEditState.cedAttachmentList) L.handleListEvent (V.EvKey V.KDown []) , mkKb AttachmentListAddEvent "Add a new attachment to the attachment list" showAttachmentFileBrowser , mkKb AttachmentOpenEvent "Open the selected attachment using the URL open command" @@ -68,12 +68,12 @@ [ mkKb CancelEvent "Cancel attachment file browse" cancelAttachmentBrowse , mkKb AttachmentOpenEvent "Open the selected file using the URL open command" - openSelectedBrowserEntry + openSelectedBrowserEntry ] withFileBrowser :: ((FB.FileBrowser Name) -> MH ()) -> MH () withFileBrowser f = do - use (csEditState.cedFileBrowser) >>= \case + use (csCurrentTeam.tsEditState.cedFileBrowser) >>= \case Nothing -> do -- The widget has not been created yet. This should -- normally not occur, because the ManageAttachments @@ -82,14 +82,15 @@ -- This could therefore be implemented as an `error "BUG: -- ..."` handler, but the more benign approach is to -- simply create an available FileBrowser at this stage. - new_b <- liftIO $ FB.newFileBrowser FB.selectNonDirectories AttachmentFileBrowser Nothing - csEditState.cedFileBrowser ?= new_b + tId <- use csCurrentTeamId + new_b <- liftIO $ FB.newFileBrowser FB.selectNonDirectories (AttachmentFileBrowser tId) Nothing + csCurrentTeam.tsEditState.cedFileBrowser ?= new_b f new_b Just b -> f b openSelectedAttachment :: MH () openSelectedAttachment = do - cur <- use (csEditState.cedAttachmentList.to L.listSelectedElement) + cur <- use (csCurrentTeam.tsEditState.cedAttachmentList.to L.listSelectedElement) case cur of Nothing -> return () Just (_, entry) -> void $ openFilePath (FB.fileInfoFilePath $ @@ -119,7 +120,7 @@ cancelAttachmentBrowse :: MH () cancelAttachmentBrowse = do - es <- use (csEditState.cedAttachmentList.L.listElementsL) + es <- use (csCurrentTeam.tsEditState.cedAttachmentList.L.listElementsL) case length es of 0 -> setMode Main _ -> setMode ManageAttachments @@ -127,14 +128,14 @@ handleFileBrowserEvent :: V.Event -> MH () handleFileBrowserEvent e = do let fbHandle ev = sequence . (fmap (FB.handleFileBrowserEvent ev)) - mhHandleEventLensed (csEditState.cedFileBrowser) fbHandle e + mhHandleEventLensed (csCurrentTeam.tsEditState.cedFileBrowser) fbHandle e withFileBrowser $ \b -> do -- TODO: Check file browser exception state let entries = FB.fileBrowserSelection b forM_ entries $ \entry -> do -- Is the entry already present? If so, ignore the selection. - es <- use (csEditState.cedAttachmentList.L.listElementsL) + es <- use (csCurrentTeam.tsEditState.cedAttachmentList.L.listElementsL) let matches = (== (FB.fileInfoFilePath entry)) . FB.fileInfoFilePath . attachmentDataFileInfo @@ -151,23 +152,23 @@ let a = AttachmentData { attachmentDataFileInfo = entry , attachmentDataBytes = bytes } - oldIdx <- use (csEditState.cedAttachmentList.L.listSelectedL) + oldIdx <- use (csCurrentTeam.tsEditState.cedAttachmentList.L.listSelectedL) let newIdx = if Vector.null es then Just 0 else oldIdx - csEditState.cedAttachmentList %= L.listReplace (Vector.snoc es a) newIdx + csCurrentTeam.tsEditState.cedAttachmentList %= L.listReplace (Vector.snoc es a) newIdx when (not $ null entries) $ setMode Main deleteSelectedAttachment :: MH () deleteSelectedAttachment = do - es <- use (csEditState.cedAttachmentList.L.listElementsL) - mSel <- use (csEditState.cedAttachmentList.to L.listSelectedElement) + es <- use (csCurrentTeam.tsEditState.cedAttachmentList.L.listElementsL) + mSel <- use (csCurrentTeam.tsEditState.cedAttachmentList.to L.listSelectedElement) case mSel of Nothing -> return () Just (pos, _) -> do - oldIdx <- use (csEditState.cedAttachmentList.L.listSelectedL) + oldIdx <- use (csCurrentTeam.tsEditState.cedAttachmentList.L.listSelectedL) let idx = if Vector.length es == 1 then Nothing else case oldIdx of @@ -175,7 +176,7 @@ Just old -> if pos >= old then Just $ pos - 1 else Just pos - csEditState.cedAttachmentList %= L.listReplace (deleteAt pos es) idx + csCurrentTeam.tsEditState.cedAttachmentList %= L.listReplace (deleteAt pos es) idx deleteAt :: Int -> Vector.Vector a -> Vector.Vector a deleteAt p as | p < 0 || p >= length as = as diff --git a/src/Matterhorn/Events/ReactionEmojiListOverlay.hs b/src/Matterhorn/Events/ReactionEmojiListOverlay.hs --- a/src/Matterhorn/Events/ReactionEmojiListOverlay.hs +++ b/src/Matterhorn/Events/ReactionEmojiListOverlay.hs @@ -18,7 +18,8 @@ onEventReactionEmojiListOverlay :: Vty.Event -> MH () onEventReactionEmojiListOverlay = - void . onEventListOverlay csReactionEmojiListOverlay reactionEmojiListOverlayKeybindings + void . onEventListOverlay (csCurrentTeam.tsReactionEmojiListOverlay) + reactionEmojiListOverlayKeybindings -- | The keybindings we want to use while viewing an emoji list overlay reactionEmojiListOverlayKeybindings :: KeyConfig -> KeyHandlerMap @@ -26,10 +27,16 @@ reactionEmojiListOverlayKeyHandlers :: [KeyEventHandler] reactionEmojiListOverlayKeyHandlers = - [ mkKb CancelEvent "Close the emoji search window" (exitListOverlay csReactionEmojiListOverlay) - , mkKb SearchSelectUpEvent "Select the previous emoji" reactionEmojiListSelectUp - , mkKb SearchSelectDownEvent "Select the next emoji" reactionEmojiListSelectDown - , mkKb PageDownEvent "Page down in the emoji list" reactionEmojiListPageDown - , mkKb PageUpEvent "Page up in the emoji list" reactionEmojiListPageUp - , mkKb ActivateListItemEvent "Post the selected emoji reaction" (listOverlayActivateCurrent csReactionEmojiListOverlay) + [ mkKb CancelEvent "Close the emoji search window" + (exitListOverlay (csCurrentTeam.tsReactionEmojiListOverlay)) + , mkKb SearchSelectUpEvent "Select the previous emoji" + reactionEmojiListSelectUp + , mkKb SearchSelectDownEvent "Select the next emoji" + reactionEmojiListSelectDown + , mkKb PageDownEvent "Page down in the emoji list" + reactionEmojiListPageDown + , mkKb PageUpEvent "Page up in the emoji list" + reactionEmojiListPageUp + , mkKb ActivateListItemEvent "Post the selected emoji reaction" + (listOverlayActivateCurrent (csCurrentTeam.tsReactionEmojiListOverlay)) ] diff --git a/src/Matterhorn/Events/ShowHelp.hs b/src/Matterhorn/Events/ShowHelp.hs --- a/src/Matterhorn/Events/ShowHelp.hs +++ b/src/Matterhorn/Events/ShowHelp.hs @@ -40,5 +40,5 @@ popMode :: MH () popMode = do - ShowHelp _ prevMode <- gets appMode + ShowHelp _ prevMode <- use (csCurrentTeam.tsMode) setMode prevMode diff --git a/src/Matterhorn/Events/ThemeListOverlay.hs b/src/Matterhorn/Events/ThemeListOverlay.hs --- a/src/Matterhorn/Events/ThemeListOverlay.hs +++ b/src/Matterhorn/Events/ThemeListOverlay.hs @@ -13,7 +13,8 @@ onEventThemeListOverlay :: Vty.Event -> MH () onEventThemeListOverlay = - void . onEventListOverlay csThemeListOverlay themeListOverlayKeybindings + void . onEventListOverlay (csCurrentTeam.tsThemeListOverlay) + themeListOverlayKeybindings -- | The keybindings we want to use while viewing a user list overlay themeListOverlayKeybindings :: KeyConfig -> KeyHandlerMap @@ -21,10 +22,16 @@ themeListOverlayKeyHandlers :: [KeyEventHandler] themeListOverlayKeyHandlers = - [ mkKb CancelEvent "Close the theme list" (exitListOverlay csThemeListOverlay) - , mkKb SearchSelectUpEvent "Select the previous theme" themeListSelectUp - , mkKb SearchSelectDownEvent "Select the next theme" themeListSelectDown - , mkKb PageDownEvent "Page down in the theme list" themeListPageDown - , mkKb PageUpEvent "Page up in the theme list" themeListPageUp - , mkKb ActivateListItemEvent "Switch to the selected color theme" (listOverlayActivateCurrent csThemeListOverlay) + [ mkKb CancelEvent "Close the theme list" + (exitListOverlay (csCurrentTeam.tsThemeListOverlay)) + , mkKb SearchSelectUpEvent "Select the previous theme" + themeListSelectUp + , mkKb SearchSelectDownEvent "Select the next theme" + themeListSelectDown + , mkKb PageDownEvent "Page down in the theme list" + themeListPageDown + , mkKb PageUpEvent "Page up in the theme list" + themeListPageUp + , mkKb ActivateListItemEvent "Switch to the selected color theme" + (listOverlayActivateCurrent (csCurrentTeam.tsThemeListOverlay)) ] diff --git a/src/Matterhorn/Events/UrlSelect.hs b/src/Matterhorn/Events/UrlSelect.hs --- a/src/Matterhorn/Events/UrlSelect.hs +++ b/src/Matterhorn/Events/UrlSelect.hs @@ -14,7 +14,7 @@ onEventUrlSelect :: Vty.Event -> MH Bool onEventUrlSelect = handleKeyboardEvent urlSelectKeybindings $ \ ev -> - mhHandleEventLensed csUrlList handleListEvent ev + mhHandleEventLensed (csCurrentTeam.tsUrlList) handleListEvent ev urlSelectKeybindings :: KeyConfig -> KeyHandlerMap urlSelectKeybindings = mkKeybindings urlSelectKeyHandlers @@ -28,10 +28,10 @@ , mkKb CancelEvent "Cancel URL selection" stopUrlSelect , mkKb SelectUpEvent "Move cursor up" $ - mhHandleEventLensed csUrlList handleListEvent (Vty.EvKey Vty.KUp []) + mhHandleEventLensed (csCurrentTeam.tsUrlList) handleListEvent (Vty.EvKey Vty.KUp []) , mkKb SelectDownEvent "Move cursor down" $ - mhHandleEventLensed csUrlList handleListEvent (Vty.EvKey Vty.KDown []) + mhHandleEventLensed (csCurrentTeam.tsUrlList) handleListEvent (Vty.EvKey Vty.KDown []) , staticKb "Cancel URL selection" (Vty.EvKey (Vty.KChar 'q') []) $ stopUrlSelect diff --git a/src/Matterhorn/Events/UserListOverlay.hs b/src/Matterhorn/Events/UserListOverlay.hs --- a/src/Matterhorn/Events/UserListOverlay.hs +++ b/src/Matterhorn/Events/UserListOverlay.hs @@ -13,7 +13,7 @@ onEventUserListOverlay :: Vty.Event -> MH () onEventUserListOverlay = - void . onEventListOverlay csUserListOverlay userListOverlayKeybindings + void . onEventListOverlay (csCurrentTeam.tsUserListOverlay) userListOverlayKeybindings -- | The keybindings we want to use while viewing a user list overlay userListOverlayKeybindings :: KeyConfig -> KeyHandlerMap @@ -21,10 +21,10 @@ userListOverlayKeyHandlers :: [KeyEventHandler] userListOverlayKeyHandlers = - [ mkKb CancelEvent "Close the user search list" (exitListOverlay csUserListOverlay) + [ mkKb CancelEvent "Close the user search list" (exitListOverlay (csCurrentTeam.tsUserListOverlay)) , mkKb SearchSelectUpEvent "Select the previous user" userListSelectUp , mkKb SearchSelectDownEvent "Select the next user" userListSelectDown , mkKb PageDownEvent "Page down in the user list" userListPageDown , mkKb PageUpEvent "Page up in the user list" userListPageUp - , mkKb ActivateListItemEvent "Interact with the selected user" (listOverlayActivateCurrent csUserListOverlay) + , mkKb ActivateListItemEvent "Interact with the selected user" (listOverlayActivateCurrent (csCurrentTeam.tsUserListOverlay)) ] diff --git a/src/Matterhorn/Events/Websocket.hs b/src/Matterhorn/Events/Websocket.hs new file mode 100644 --- /dev/null +++ b/src/Matterhorn/Events/Websocket.hs @@ -0,0 +1,236 @@ +module Matterhorn.Events.Websocket + ( handleWebsocketEvent + , handleWebsocketActionResponse + ) +where + +import Prelude () +import Matterhorn.Prelude + +import qualified Data.HashMap.Strict as HM +import qualified Data.Sequence as Seq +import qualified Data.Set as Set +import qualified Data.Text as T +import Lens.Micro.Platform ( preuse ) + +import Network.Mattermost.Lenses +import Network.Mattermost.Types +import Network.Mattermost.WebSocket + +import Matterhorn.State.ChannelList +import Matterhorn.State.Channels +import Matterhorn.State.Common +import Matterhorn.State.Flagging +import Matterhorn.State.Messages +import Matterhorn.State.Reactions +import Matterhorn.State.Teams +import Matterhorn.State.Users +import Matterhorn.Types +import Matterhorn.Types.Common + + +foreachTeam :: (TeamId -> MH ()) -> MH () +foreachTeam act = do + ts <- use csTeams + let myTIds = HM.keys ts + mapM_ act myTIds + +handleWebsocketEvent :: WebsocketEvent -> MH () +handleWebsocketEvent we = do + myId <- gets myUserId + ts <- use csTeams + let memberOf tId = HM.member tId ts + + -- The team ID is one of the teams we're in, or the team ID is + -- absent, which typically indicates a DM channel event since DM + -- channels are not associated with teams. + inMyTeamOrDM (Just i) = memberOf i + inMyTeamOrDM Nothing = True + + -- The team ID is one of the teams we're in. A missing team ID + -- yields False. + inMyTeam (Just i) = memberOf i + inMyTeam Nothing = False + + case weEvent we of + WMPosted + | Just p <- wepPost (weData we) -> + when (inMyTeamOrDM (wepTeamId (weData we))) $ do + let wasMentioned = maybe False (Set.member myId) $ wepMentions (weData we) + addNewPostedMessage $ RecentPost p wasMentioned + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) + when (postChannelId p /= cId) $ + showChannelInSidebar (p^.postChannelIdL) False + | otherwise -> return () + + WMPostEdited + | Just p <- wepPost (weData we) -> do + editMessage p + + currTid <- use csCurrentTeamId + foreachTeam $ \tId -> do + cId <- use (csCurrentChannelId tId) + when (postChannelId p == cId && tId == currTid) $ + updateViewed False + when (postChannelId p /= cId) $ + showChannelInSidebar (p^.postChannelIdL) False + | otherwise -> return () + + WMPostDeleted + | Just p <- wepPost (weData we) -> do + deleteMessage p + + currTid <- use csCurrentTeamId + foreachTeam $ \tId -> do + cId <- use (csCurrentChannelId tId) + when (postChannelId p == cId && tId == currTid) $ + updateViewed False + when (postChannelId p /= cId) $ + showChannelInSidebar (p^.postChannelIdL) False + | otherwise -> return () + + WMStatusChange + | Just status <- wepStatus (weData we) + , Just uId <- wepUserId (weData we) -> + setUserStatus uId status + | otherwise -> return () + + -- Despite this event's name, it means "a user was added to a + -- channel". The event that occurs when a new user is added to + -- the server, see WMNewUser. + WMUserAdded + | Just cId <- webChannelId (weBroadcast we) -> + when (wepUserId (weData we) == Just myId && + inMyTeam (wepTeamId (weData we))) $ + handleChannelInvite cId + | otherwise -> return () + + WMNewUser + | Just uId <- wepUserId $ weData we -> + handleNewUsers (Seq.singleton uId) (return ()) + | otherwise -> return () + + WMUserRemoved + | Just cId <- wepChannelId (weData we) -> + when (webUserId (weBroadcast we) == Just myId) $ + removeChannelFromState cId + | otherwise -> return () + + WMTyping + | Just uId <- wepUserId $ weData we + , Just cId <- webChannelId (weBroadcast we) -> handleTypingUser uId cId + | otherwise -> return () + + WMChannelDeleted + | Just cId <- wepChannelId (weData we) -> + when (inMyTeamOrDM (webTeamId (weBroadcast we))) $ + removeChannelFromState cId + | otherwise -> return () + + WMDirectAdded + | Just cId <- webChannelId (weBroadcast we) -> handleChannelInvite cId + | otherwise -> return () + + -- An 'ephemeral message' is just Mattermost's version of our + -- 'client message'. This can be a little bit wacky, e.g. + -- if the user types '/shortcuts' in the browser, we'll get + -- an ephemeral message even in MatterHorn with the browser + -- shortcuts, but it's probably a good idea to handle these + -- messages anyway. + WMEphemeralMessage + | Just p <- wepPost $ weData we -> postInfoMessage (sanitizeUserText $ p^.postMessageL) + | otherwise -> return () + + WMPreferenceChanged + | Just prefs <- wepPreferences (weData we) -> + mapM_ applyPreferenceChange prefs + | otherwise -> return () + + WMPreferenceDeleted + | Just pref <- wepPreferences (weData we) + , Just fps <- mapM preferenceToFlaggedPost pref -> + forM_ fps $ \f -> + updateMessageFlag (flaggedPostId f) False + | otherwise -> return () + + WMReactionAdded + | Just r <- wepReaction (weData we) + , Just cId <- webChannelId (weBroadcast we) -> addReactions cId [r] + | otherwise -> return () + + WMReactionRemoved + | Just r <- wepReaction (weData we) + , Just cId <- webChannelId (weBroadcast we) -> removeReaction r cId + | otherwise -> return () + + WMChannelViewed + | Just cId <- wepChannelId $ weData we -> refreshChannelById cId + | otherwise -> return () + + WMChannelUpdated + | Just cId <- webChannelId $ weBroadcast we -> do + mChan <- preuse (csChannel(cId)) + case mChan of + Just chan -> do + refreshChannelById cId + updateSidebar (chan^.ccInfo.cdTeamId) + Nothing -> return () + | otherwise -> return () + + WMGroupAdded + | Just cId <- webChannelId (weBroadcast we) -> handleChannelInvite cId + | otherwise -> return () + + WMChannelMemberUpdated + | Just channelMember <- wepChannelMember $ weData we -> + when (channelMemberUserId channelMember == myId) $ + updateChannelNotifyProps + (channelMemberChannelId channelMember) + (channelMemberNotifyProps channelMember) + | otherwise -> return () + + WMAddedToTeam + | Just tId <- wepTeamId $ weData we + , Just uId <- wepUserId $ weData we -> do + when (uId == myId && not (memberOf tId)) $ do + handleJoinTeam tId + | otherwise -> return () + + WMUpdateTeam + | Just tId <- webTeamId $ weBroadcast we -> do + when (memberOf tId) $ do + handleUpdateTeam tId + | otherwise -> return () + + WMLeaveTeam + | Just tId <- wepTeamId $ weData we + , Just uId <- wepUserId $ weData we -> do + when (uId == myId && memberOf tId) $ do + handleLeaveTeam tId + | otherwise -> return () + + WMTeamDeleted -> do + mhLog LogGeneral $ T.pack $ + "WMTeamDeleted event: " <> show we + + WMUserUpdated -> return () + + -- We deliberately ignore these events: + WMChannelCreated -> return () + WMEmojiAdded -> return () + WMWebRTC -> return () + WMHello -> return () + WMAuthenticationChallenge -> return () + WMUserRoleUpdated -> return () + WMPluginStatusesChanged -> return () + WMPluginEnabled -> return () + WMPluginDisabled -> return () + WMUnknownEvent {} -> + mhLog LogWebsocket $ T.pack $ + "Websocket event not handled due to unknown event type: " <> show we + +handleWebsocketActionResponse :: WebsocketActionResponse -> MH () +handleWebsocketActionResponse r = + case warStatus r of + WebsocketActionStatusOK -> return () diff --git a/src/Matterhorn/LastRunState.hs b/src/Matterhorn/LastRunState.hs --- a/src/Matterhorn/LastRunState.hs +++ b/src/Matterhorn/LastRunState.hs @@ -5,7 +5,7 @@ , lrsPort , lrsUserId , lrsSelectedChannelId - , writeLastRunState + , writeLastRunStates , readLastRunState , isValidLastRunState ) @@ -18,6 +18,7 @@ import qualified Data.Aeson as A import qualified Data.ByteString as BS import qualified Data.ByteString.Lazy as LBS +import qualified Data.HashMap.Strict as HM import Lens.Micro.Platform ( makeLenses ) import System.Directory ( createDirectoryIfMissing ) import System.FilePath ( dropFileName ) @@ -63,7 +64,7 @@ { _lrsHost = cs^.csResources.crConn.cdHostnameL , _lrsPort = cs^.csResources.crConn.cdPortL , _lrsUserId = myUserId cs - , _lrsSelectedChannelId = cs^.csCurrentChannelId + , _lrsSelectedChannelId = cs^.csCurrentChannelId(cs^.csCurrentTeamId) } lastRunStateFileMode :: P.FileMode @@ -71,16 +72,20 @@ -- | Writes the run state to a file. The file is specific to the current team. -- | Writes only if the current channel is an ordrinary or a private channel. -writeLastRunState :: ChatState -> IO () -writeLastRunState cs = - when (cs^.csCurrentChannel.ccInfo.cdType `elem` [Ordinary, Private]) $ do - let runState = toLastRunState cs - tId = myTeamId cs +writeLastRunStates :: ChatState -> IO () +writeLastRunStates cs = + forM_ (HM.keys $ cs^.csTeams) $ \tId -> + writeLastRunState cs tId - lastRunStateFile <- lastRunStateFilePath $ unId $ toId tId - createDirectoryIfMissing True $ dropFileName lastRunStateFile - BS.writeFile lastRunStateFile $ LBS.toStrict $ A.encode runState - P.setFileMode lastRunStateFile lastRunStateFileMode +writeLastRunState :: ChatState -> TeamId -> IO () +writeLastRunState cs tId = do + when (cs^.csCurrentChannel.ccInfo.cdType `elem` [Ordinary, Private]) $ do + let runState = toLastRunState cs + + lastRunStateFile <- lastRunStateFilePath $ unId $ toId tId + createDirectoryIfMissing True $ dropFileName lastRunStateFile + BS.writeFile lastRunStateFile $ LBS.toStrict $ A.encode runState + P.setFileMode lastRunStateFile lastRunStateFileMode -- | Reads the last run state from a file given the current team ID. readLastRunState :: TeamId -> IO (Either String LastRunState) diff --git a/src/Matterhorn/Scripts.hs b/src/Matterhorn/Scripts.hs --- a/src/Matterhorn/Scripts.hs +++ b/src/Matterhorn/Scripts.hs @@ -47,8 +47,11 @@ ExitSuccess -> do case null $ programStderr po of True -> Just $ do - mode <- use (csEditState.cedEditMode) - sendMessage cId mode (T.pack $ programStdout po) [] + withChannel cId $ \chan -> do + mode <- case chan^.ccInfo.cdTeamId of + Nothing -> use (csCurrentTeam.tsEditState.cedEditMode) + Just tId -> use (csTeam(tId).tsEditState.cedEditMode) + sendMessage cId mode (T.pack $ programStdout po) [] False -> Nothing ExitFailure _ -> Nothing diff --git a/src/Matterhorn/State/Attachments.hs b/src/Matterhorn/State/Attachments.hs --- a/src/Matterhorn/State/Attachments.hs +++ b/src/Matterhorn/State/Attachments.hs @@ -34,20 +34,23 @@ showAttachmentList :: MH () showAttachmentList = do - lst <- use (csEditState.cedAttachmentList) + lst <- use (csCurrentTeam.tsEditState.cedAttachmentList) case length (L.listElements lst) of 0 -> showAttachmentFileBrowser _ -> setMode ManageAttachments resetAttachmentList :: MH () resetAttachmentList = do - csEditState.cedAttachmentList .= L.list AttachmentList mempty 1 - mh $ vScrollToBeginning $ viewportScroll AttachmentList + tId <- use csCurrentTeamId + let listName = AttachmentList tId + csCurrentTeam.tsEditState.cedAttachmentList .= L.list listName mempty 1 + mh $ vScrollToBeginning $ viewportScroll listName showAttachmentFileBrowser :: MH () showAttachmentFileBrowser = do config <- use (csResources.crConfiguration) + tId <- use csCurrentTeamId filePath <- liftIO $ defaultAttachmentsPath config - browser <- liftIO $ Just <$> FB.newFileBrowser FB.selectNonDirectories AttachmentFileBrowser filePath - csEditState.cedFileBrowser .= browser + browser <- liftIO $ Just <$> FB.newFileBrowser FB.selectNonDirectories (AttachmentFileBrowser tId) filePath + csCurrentTeam.tsEditState.cedFileBrowser .= browser setMode ManageAttachmentsBrowseFiles diff --git a/src/Matterhorn/State/Autocomplete.hs b/src/Matterhorn/State/Autocomplete.hs --- a/src/Matterhorn/State/Autocomplete.hs +++ b/src/Matterhorn/State/Autocomplete.hs @@ -22,7 +22,7 @@ import Lens.Micro.Platform ( (%=), (.=), (.~), _Just, preuse ) import qualified Skylighting.Types as Sky -import Network.Mattermost.Types (userId, channelId, Command(..)) +import Network.Mattermost.Types (userId, channelId, Command(..), TeamId) import qualified Network.Mattermost.Endpoints as MM import Matterhorn.Constants ( userSigil, normalChannelSigil ) @@ -61,7 +61,7 @@ case result of Nothing -> resetAutocomplete Just (ty, runUpdater, searchString) -> do - prevResult <- use (csEditState.cedAutocomplete) + prevResult <- use (csCurrentTeam.tsEditState.cedAutocomplete) -- We should update the completion state if EITHER: -- -- 1) The type changed @@ -74,13 +74,13 @@ (maybe True ((== ty) . _acType) prevResult)) || (maybe False ((/= ty) . _acType) prevResult) when shouldUpdate $ do - csEditState.cedAutocompletePending .= Just searchString + csCurrentTeam.tsEditState.cedAutocompletePending .= Just searchString runUpdater ty ctx searchString getCompleterForInput :: AutocompleteContext -> MH (Maybe (AutocompletionType, AutocompletionType -> AutocompleteContext -> Text -> MH (), Text)) getCompleterForInput ctx = do - z <- use (csEditState.cedEditor.editContentsL) + z <- use (csCurrentTeam.tsEditState.cedEditor.editContentsL) let col = snd $ Z.cursorPosition z curLine = Z.currentLine z @@ -105,21 +105,23 @@ doEmojiAutoCompletion ty ctx searchString = do session <- getSession em <- use (csResources.crEmoji) - withCachedAutocompleteResults ctx ty searchString $ + tId <- use csCurrentTeamId + withCachedAutocompleteResults tId ctx ty searchString $ doAsyncWith Preempt $ do results <- getMatchingEmoji session em searchString let alts = EmojiCompletion <$> results - return $ Just $ setCompletionAlternatives ctx searchString alts ty + return $ Just $ setCompletionAlternatives tId ctx searchString alts ty doSyntaxAutoCompletion :: AutocompletionType -> AutocompleteContext -> Text -> MH () doSyntaxAutoCompletion ty ctx searchString = do mapping <- use (csResources.crSyntaxMap) + tId <- use csCurrentTeamId let allNames = Sky.sShortname <$> M.elems mapping (prefixed, notPrefixed) = partition isPrefixed $ filter match allNames match = (((T.toLower searchString) `T.isInfixOf`) . T.toLower) isPrefixed = (((T.toLower searchString) `T.isPrefixOf`) . T.toLower) alts = SyntaxCompletion <$> (sort prefixed <> sort notPrefixed) - setCompletionAlternatives ctx searchString alts ty + setCompletionAlternatives tId ctx searchString alts ty -- | This list of server commands should be hidden because they make -- assumptions about a web-based client or otherwise just don't make @@ -165,10 +167,10 @@ doCommandAutoCompletion :: AutocompletionType -> AutocompleteContext -> Text -> MH () doCommandAutoCompletion ty ctx searchString = do session <- getSession - myTid <- gets myTeamId + myTid <- use csCurrentTeamId - mCache <- preuse (csEditState.cedAutocomplete._Just.acCachedResponses) - mActiveTy <- preuse (csEditState.cedAutocomplete._Just.acType) + mCache <- preuse (csTeam(myTid).tsEditState.cedAutocomplete._Just.acCachedResponses) + mActiveTy <- preuse (csTeam(myTid).tsEditState.cedAutocomplete._Just.acType) -- Command completion works a little differently than the other -- modes. To do command autocompletion, we want to query the server @@ -222,19 +224,19 @@ return $ Just $ do -- Store the complete list of alterantives in the cache - setCompletionAlternatives ctx serverResponseKey alts ty + setCompletionAlternatives myTid ctx serverResponseKey alts ty -- Also store the list of alternatives specific to -- this search string let newAlts = sortBy (compareCommandAlts searchString) $ filter matches alts - setCompletionAlternatives ctx searchString newAlts ty + setCompletionAlternatives myTid ctx searchString newAlts ty else case entry of Just alts | mActiveTy == Just ACCommands -> let newAlts = sortBy (compareCommandAlts searchString) $ filter matches alts - in setCompletionAlternatives ctx searchString newAlts ty + in setCompletionAlternatives myTid ctx searchString newAlts ty _ -> return () compareCommandAlts :: Text -> AutocompleteAlternative -> AutocompleteAlternative -> Ordering @@ -252,13 +254,13 @@ doUserAutoCompletion :: AutocompletionType -> AutocompleteContext -> Text -> MH () doUserAutoCompletion ty ctx searchString = do session <- getSession - myTid <- gets myTeamId + tId <- use csCurrentTeamId myUid <- gets myUserId - cId <- use csCurrentChannelId + cId <- use (csCurrentChannelId(tId)) - withCachedAutocompleteResults ctx ty searchString $ + withCachedAutocompleteResults tId ctx ty searchString $ doAsyncWith Preempt $ do - ac <- MM.mmAutocompleteUsers (Just myTid) (Just cId) searchString session + ac <- MM.mmAutocompleteUsers (Just tId) (Just cId) searchString session let active = Seq.filter (\u -> userId u /= myUid && (not $ userDeleted u)) alts = F.toList $ @@ -273,22 +275,22 @@ , (T.toLower searchString) `T.isPrefixOf` specialMentionName m ] - return $ Just $ setCompletionAlternatives ctx searchString (alts <> extras) ty + return $ Just $ setCompletionAlternatives tId ctx searchString (alts <> extras) ty doChannelAutoCompletion :: AutocompletionType -> AutocompleteContext -> Text -> MH () doChannelAutoCompletion ty ctx searchString = do session <- getSession - tId <- gets myTeamId + tId <- use csCurrentTeamId cs <- use csChannels - withCachedAutocompleteResults ctx ty searchString $ do + withCachedAutocompleteResults tId ctx ty searchString $ do doAsyncWith Preempt $ do results <- MM.mmAutocompleteChannels tId searchString session let alts = F.toList $ (ChannelCompletion True <$> inChannels) <> (ChannelCompletion False <$> notInChannels) (inChannels, notInChannels) = Seq.partition isMember results isMember c = isJust $ findChannelById (channelId c) cs - return $ Just $ setCompletionAlternatives ctx searchString alts ty + return $ Just $ setCompletionAlternatives tId ctx searchString alts ty -- Utility functions @@ -296,7 +298,8 @@ -- a given search string. If the cache contains no such entry (keyed -- on search string), run the specified action, which is assumed to be -- responsible for fetching the completion results from the server. -withCachedAutocompleteResults :: AutocompleteContext +withCachedAutocompleteResults :: TeamId + -> AutocompleteContext -- ^ The autocomplete context -> AutocompletionType -- ^ The type of autocompletion we're @@ -307,26 +310,27 @@ -> MH () -- ^ The action to execute on a cache miss -> MH () -withCachedAutocompleteResults ctx ty searchString act = do - mCache <- preuse (csEditState.cedAutocomplete._Just.acCachedResponses) - mActiveTy <- preuse (csEditState.cedAutocomplete._Just.acType) +withCachedAutocompleteResults tId ctx ty searchString act = do + mCache <- preuse (csTeam(tId).tsEditState.cedAutocomplete._Just.acCachedResponses) + mActiveTy <- preuse (csTeam(tId).tsEditState.cedAutocomplete._Just.acType) case Just ty == mActiveTy of True -> -- Does the cache have results for this search string? If -- so, use them; otherwise invoke the specified action. case HM.lookup searchString =<< mCache of - Just alts -> setCompletionAlternatives ctx searchString alts ty + Just alts -> setCompletionAlternatives tId ctx searchString alts ty Nothing -> act False -> act -setCompletionAlternatives :: AutocompleteContext +setCompletionAlternatives :: TeamId + -> AutocompleteContext -> Text -> [AutocompleteAlternative] -> AutocompletionType -> MH () -setCompletionAlternatives ctx searchString alts ty = do - let list = L.list CompletionList (V.fromList $ F.toList alts) 1 +setCompletionAlternatives tId ctx searchString alts ty = do + let list = L.list (CompletionList tId) (V.fromList $ F.toList alts) 1 state = AutocompleteState { _acPreviousSearchString = searchString , _acCompletionList = list & L.listSelectedL .~ Nothing @@ -334,13 +338,13 @@ , _acType = ty } - pending <- use (csEditState.cedAutocompletePending) + pending <- use (csTeam(tId).tsEditState.cedAutocompletePending) case pending of Just val | val == searchString -> do -- If there is already state, update it, but also cache the -- search results. - csEditState.cedAutocomplete %= \prev -> + csTeam(tId).tsEditState.cedAutocomplete %= \prev -> let newState = case prev of Nothing -> state @@ -349,7 +353,7 @@ HM.insert searchString alts (oldState^.acCachedResponses) in Just newState - mh $ vScrollToBeginning $ viewportScroll CompletionList + mh $ vScrollToBeginning $ viewportScroll $ CompletionList tId when (autocompleteFirstMatch ctx) $ tabComplete Forwards diff --git a/src/Matterhorn/State/ChannelList.hs b/src/Matterhorn/State/ChannelList.hs new file mode 100644 --- /dev/null +++ b/src/Matterhorn/State/ChannelList.hs @@ -0,0 +1,164 @@ +module Matterhorn.State.ChannelList + ( updateSidebar + , updateWindowTitle + , toggleChannelListVisibility + , showChannelInSidebar + ) +where + +import Prelude () +import Matterhorn.Prelude + +import Brick.Main ( getVtyHandle, invalidateCache, invalidateCacheEntry ) +import qualified Data.HashMap.Strict as HM +import qualified Data.Sequence as Seq +import Data.Time.Clock ( getCurrentTime ) +import qualified Graphics.Vty as Vty +import Lens.Micro.Platform + +import Network.Mattermost.Types +import Network.Mattermost.Lenses +import qualified Network.Mattermost.Endpoints as MM + +import {-# SOURCE #-} Matterhorn.State.Messages ( fetchVisibleIfNeeded ) +import Matterhorn.Types +import Matterhorn.State.Async +import qualified Matterhorn.Zipper as Z + + +-- | Update the sidebar for the specified team state only, or all team +-- states if not given a specific team ID. +-- +-- In either case, schedule user status fetches for all users mentioned +-- in the current team's sidebar. (This should be safe because all +-- sidebars should contain the same user list.) +updateSidebar :: Maybe TeamId -> MH () +updateSidebar mTid = do + case mTid of + Nothing -> do + ts <- use csTeams + forM_ (HM.keys ts) updateTeamSidebar + Just tId -> do + updateTeamSidebar tId + + -- Schedule the current team's sidebar for user status updates at + -- the end of this MH action. This is okay because all team sidebars + -- should include the same set of DM channels. + z <- use (csCurrentTeam.tsFocus) + myId <- gets myUserId + scheduleUserStatusFetches $ myId : userIdsFromZipper z + + updateWindowTitle + +updateWindowTitle :: MH () +updateWindowTitle = do + -- Update the window title based on the unread status of the + -- channels in all teams. + ts <- use csTeams + unreadCounts <- forM (HM.keys ts) $ \tId -> do + z <- use (csTeam(tId).tsFocus) + return $ sum $ (channelListGroupUnread . fst) <$> Z.toList z + + let title = "matterhorn" <> if unread > 0 then "(" <> show unread <> ")" else "" + unread = sum unreadCounts + + vty <- mh getVtyHandle + liftIO $ Vty.setWindowTitle vty title + +updateTeamSidebar :: TeamId -> MH () +updateTeamSidebar tId = do + -- Invalidate the cached sidebar rendering since we are about to + -- change the underlying state + mh $ invalidateCacheEntry $ ChannelSidebar tId + + -- Get the currently-focused channel ID so we can compare after the + -- zipper is rebuilt + cconfig <- use csClientConfig + oldCid <- use (csCurrentChannelId tId) + + -- Update the zipper + cs <- use csChannels + us <- getUsers + prefs <- use (csResources.crUserPreferences) + now <- liftIO getCurrentTime + config <- use (csResources.crConfiguration) + + let zl = mkChannelZipperList now config tId cconfig prefs cs us + csTeam(tId).tsFocus %= Z.updateList zl + + -- If the zipper rebuild caused the current channel to change, such + -- as when the previously-focused channel was removed, we need to + -- call fetchVisibleIfNeeded on the newly-focused channel to ensure + -- that it gets loaded. + newCid <- use (csCurrentChannelId tId) + when (newCid /= oldCid) $ + fetchVisibleIfNeeded + +toggleChannelListVisibility :: MH () +toggleChannelListVisibility = do + mh invalidateCache + csResources.crConfiguration.configShowChannelListL %= not + +showChannelInSidebar :: ChannelId -> Bool -> MH () +showChannelInSidebar cId setPending = do + mChan <- preuse $ csChannel cId + me <- gets myUser + prefs <- use (csResources.crUserPreferences) + session <- getSession + + case mChan of + Nothing -> + -- The requested channel doesn't actually exist yet, so no + -- action can be taken. It's likely that this is a + -- pendingChannel situation and not all of the operations to + -- locally define the channel have completed, in which case + -- this code will be re-entered later and the mChan will be + -- known. + return () + Just ch -> do + + -- Able to successfully switch to a known channel. This + -- should clear any pending channel intention. If the + -- intention was for this channel, then: done. If the + -- intention was for a different channel, reaching this + -- point means that the pending is still outstanding but + -- that the user identified a new channel which *was* + -- displayable, and the UI should always prefer to SATISFY + -- the user's latest request over any pending/background + -- task. + csCurrentTeam.tsPendingChannelChange .= Nothing + + now <- liftIO getCurrentTime + csChannel(cId).ccInfo.cdSidebarShowOverride .= Just now + updateSidebar (ch^.ccInfo.cdTeamId) + + curTid <- use csCurrentTeamId + let tId = fromMaybe curTid (ch^.ccInfo.cdTeamId) + + case ch^.ccInfo.cdType of + Direct -> do + let Just uId = ch^.ccInfo.cdDMUserId + case dmChannelShowPreference prefs uId of + Just False -> do + let pref = showDirectChannelPref (me^.userIdL) uId True + when setPending $ + csCurrentTeam.tsPendingChannelChange .= + Just (ChangeByChannelId tId (ch^.ccInfo.cdChannelId) Nothing) + doAsyncWith Preempt $ do + MM.mmSaveUsersPreferences UserMe (Seq.singleton pref) session + return Nothing + _ -> return () + + Group -> + case groupChannelShowPreference prefs cId of + Just False -> do + let pref = showGroupChannelPref cId (me^.userIdL) + when setPending $ + csCurrentTeam.tsPendingChannelChange .= + Just (ChangeByChannelId tId (ch^.ccInfo.cdChannelId) Nothing) + doAsyncWith Preempt $ do + MM.mmSaveUsersPreferences UserMe (Seq.singleton pref) session + return Nothing + _ -> return () + + _ -> return () diff --git a/src/Matterhorn/State/ChannelListOverlay.hs b/src/Matterhorn/State/ChannelListOverlay.hs --- a/src/Matterhorn/State/ChannelListOverlay.hs +++ b/src/Matterhorn/State/ChannelListOverlay.hs @@ -27,9 +27,9 @@ enterChannelListOverlayMode :: MH () enterChannelListOverlayMode = do - myTId <- gets myTeamId + myTId <- use csCurrentTeamId myChannels <- use (csChannels.to (filteredChannelIds (const True))) - enterListOverlayMode csChannelListOverlay ChannelListOverlay + enterListOverlayMode (csTeam(myTId).tsChannelListOverlay) ChannelListOverlay AllChannels enterHandler (fetchResults myTId myChannels) enterHandler :: Channel -> MH Bool @@ -75,7 +75,7 @@ -- cursor, and then check to see whether the modification warrants a -- prefetch of more search results. channelListMove :: (L.List Name Channel -> L.List Name Channel) -> MH () -channelListMove = listOverlayMove csChannelListOverlay +channelListMove = listOverlayMove (csCurrentTeam.tsChannelListOverlay) -- | The number of channels in a "page" for cursor movement purposes. channelListPageSize :: Int diff --git a/src/Matterhorn/State/ChannelSelect.hs b/src/Matterhorn/State/ChannelSelect.hs --- a/src/Matterhorn/State/ChannelSelect.hs +++ b/src/Matterhorn/State/ChannelSelect.hs @@ -24,14 +24,15 @@ beginChannelSelect :: MH () beginChannelSelect = do setMode ChannelSelect - csChannelSelectState .= emptyChannelSelectState + tId <- use csCurrentTeamId + csCurrentTeam.tsChannelSelectState .= emptyChannelSelectState tId updateChannelSelectMatches -- Preserve the current channel selection when initializing channel -- selection mode - zipper <- use csFocus + zipper <- use (csCurrentTeam.tsFocus) let isCurrentFocus m = Just (matchEntry m) == Z.focus zipper - csChannelSelectState.channelSelectMatches %= Z.findRight isCurrentFocus + csCurrentTeam.tsChannelSelectState.channelSelectMatches %= Z.findRight isCurrentFocus -- Select the next match in channel selection mode. channelSelectNext :: MH () @@ -45,7 +46,7 @@ updateChannelSelectMatches = do st <- use id - input <- use (csChannelSelectState.channelSelectInput) + input <- use (csCurrentTeam.tsChannelSelectState.channelSelectInput) cconfig <- use csClientConfig prefs <- use (csResources.crUserPreferences) @@ -82,7 +83,8 @@ preserveFocus Nothing _ = False preserveFocus (Just m) m2 = matchEntry m == matchEntry m2 - csChannelSelectState.channelSelectMatches %= (Z.updateListBy preserveFocus $ Z.toList $ Z.maybeMapZipper matches (st^.csFocus)) + csCurrentTeam.tsChannelSelectState.channelSelectMatches %= + (Z.updateListBy preserveFocus $ Z.toList $ Z.maybeMapZipper matches (st^.csCurrentTeam.tsFocus)) applySelectPattern :: ChannelSelectPattern -> ChannelListEntry -> Text -> Maybe ChannelSelectMatch applySelectPattern CSPAny entry chanName = do @@ -152,4 +154,4 @@ updateSelectedMatch :: (Z.Zipper ChannelListGroup ChannelSelectMatch -> Z.Zipper ChannelListGroup ChannelSelectMatch) -> MH () updateSelectedMatch nextItem = - csChannelSelectState.channelSelectMatches %= nextItem + csCurrentTeam.tsChannelSelectState.channelSelectMatches %= nextItem diff --git a/src/Matterhorn/State/ChannelTopicWindow.hs b/src/Matterhorn/State/ChannelTopicWindow.hs --- a/src/Matterhorn/State/ChannelTopicWindow.hs +++ b/src/Matterhorn/State/ChannelTopicWindow.hs @@ -3,6 +3,9 @@ ) where +import Prelude () +import Matterhorn.Prelude + import Lens.Micro.Platform ( (.=) ) import Matterhorn.Types @@ -12,5 +15,6 @@ openChannelTopicWindow :: MH () openChannelTopicWindow = do t <- getCurrentChannelTopic - csChannelTopicDialog .= newChannelTopicDialog t + tId <- use csCurrentTeamId + csCurrentTeam.tsChannelTopicDialog .= newChannelTopicDialog tId t setMode ChannelTopicWindow diff --git a/src/Matterhorn/State/Channels.hs b/src/Matterhorn/State/Channels.hs --- a/src/Matterhorn/State/Channels.hs +++ b/src/Matterhorn/State/Channels.hs @@ -1,9 +1,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE MultiWayIf #-} module Matterhorn.State.Channels - ( updateSidebar - , updateViewed - , updateViewedChan + ( updateViewed , refreshChannel , refreshChannelsAndUsers , setFocus @@ -16,7 +14,6 @@ , nextUnreadChannel , nextUnreadUserOrChannel , createOrFocusDMChannel - , clearChannelUnreadStatus , prevChannel , nextChannel , recentChannel @@ -46,17 +43,16 @@ , setChannelTopic , getCurrentChannelTopic , beginCurrentChannelDeleteConfirm - , toggleChannelListVisibility , toggleExpandedChannelTopics - , showChannelInSidebar , updateChannelNotifyProps + , renameChannelUrl ) where import Prelude () import Matterhorn.Prelude -import Brick.Main ( getVtyHandle, viewportScroll, vScrollToBeginning +import Brick.Main ( viewportScroll, vScrollToBeginning , invalidateCache, invalidateCacheEntry ) import Brick.Widgets.Edit ( applyEdit, getEditContents, editContentsL ) import Control.Concurrent.Async ( runConcurrently, Concurrently(..) ) @@ -71,7 +67,6 @@ import qualified Data.Text as T import Data.Text.Zipper ( textZipper, clearZipper, insertMany, gotoEOL ) import Data.Time.Clock ( getCurrentTime ) -import qualified Graphics.Vty as Vty import Lens.Micro.Platform import qualified Network.Mattermost.Endpoints as MM @@ -82,6 +77,7 @@ import Matterhorn.InputHistory import Matterhorn.State.Common import {-# SOURCE #-} Matterhorn.State.Messages ( fetchVisibleIfNeeded ) +import Matterhorn.State.ChannelList import Matterhorn.State.Users import Matterhorn.State.Flagging import Matterhorn.Types @@ -90,53 +86,11 @@ import qualified Matterhorn.Zipper as Z -updateSidebar :: MH () -updateSidebar = do - -- Invalidate the cached sidebar rendering since we are about to - -- change the underlying state - mh $ invalidateCacheEntry ChannelSidebar - - -- Get the currently-focused channel ID so we can compare after the - -- zipper is rebuilt - cconfig <- use csClientConfig - oldCid <- use csCurrentChannelId - - -- Update the zipper - cs <- use csChannels - us <- getUsers - prefs <- use (csResources.crUserPreferences) - now <- liftIO getCurrentTime - config <- use (csResources.crConfiguration) - - let zl = mkChannelZipperList now config cconfig prefs cs us - csFocus %= Z.updateList zl - - -- Schedule the current sidebar for user status updates at the end - -- of this MH action. - newZ <- use csFocus - myId <- gets myUserId - scheduleUserStatusFetches $ myId : userIdsFromZipper newZ - - -- Update the window title based on the unread status of the - -- channels. - let unread = sum $ (channelListGroupUnread . fst) <$> zl - title = "matterhorn" <> if unread > 0 then "(" <> show unread <> ")" else "" - - vty <- mh getVtyHandle - liftIO $ Vty.setWindowTitle vty title - - -- If the zipper rebuild caused the current channel to change, such - -- as when the previously-focused channel was removed, we need to - -- call fetchVisibleIfNeeded on the newly-focused channel to ensure - -- that it gets loaded. - newCid <- use csCurrentChannelId - when (newCid /= oldCid) $ - fetchVisibleIfNeeded - updateViewed :: Bool -> MH () updateViewed updatePrev = do csCurrentChannel.ccInfo.cdMentionCount .= 0 - updateViewedChan updatePrev =<< use csCurrentChannelId + tId <- use csCurrentTeamId + updateViewedChan updatePrev =<< use (csCurrentChannelId tId) -- | When a new channel has been selected for viewing, this will -- notify the server of the change, and also update the local channel @@ -149,15 +103,19 @@ -- of the specified channel, False should be provided. updateViewedChan :: Bool -> ChannelId -> MH () updateViewedChan updatePrev cId = use csConnectionStatus >>= \case + -- Only do this if we're connected to avoid triggering noisy + -- exceptions. Connected -> do - -- Only do this if we're connected to avoid triggering noisy - -- exceptions. - pId <- if updatePrev - then use csRecentChannel - else return Nothing - doAsyncChannelMM Preempt cId - (\s c -> MM.mmViewChannel UserMe c pId s) - (\c () -> Just $ setLastViewedFor pId c) + withChannel cId $ \chan -> do + pId <- if updatePrev + then do + case chan^.ccInfo.cdTeamId of + Just tId -> use (csTeam(tId).tsRecentChannel) + Nothing -> use (csCurrentTeam.tsRecentChannel) + else return Nothing + doAsyncChannelMM Preempt cId + (\s c -> MM.mmViewChannel UserMe c pId s) + (\c () -> Just $ setLastViewedFor pId c) Disconnected -> -- Cannot update server; make no local updates to avoid getting -- out of sync with the server. Assumes that this is a temporary @@ -167,19 +125,17 @@ -- this state is irrelevant. return () -toggleChannelListVisibility :: MH () -toggleChannelListVisibility = do - mh invalidateCache - csShowChannelList %= not - toggleExpandedChannelTopics :: MH () toggleExpandedChannelTopics = do mh invalidateCache - csShowExpandedChannelTopics %= not + csResources.crConfiguration.configShowExpandedChannelTopicsL %= not -- | If the current channel is a DM channel with a single user or a -- group of users, hide it from the sidebar and adjust the server-side --- preference to hide it persistently. +-- preference to hide it persistently. Note that this does not actually +-- hide the channel in our UI; we hide it in response to the preference +-- change websocket event triggered by this function's API interaction +-- with the server. -- -- If the current channel is any other kind of channel, complain with a -- usage error. @@ -261,14 +217,17 @@ refreshChannelsAndUsers :: MH () refreshChannelsAndUsers = do session <- getSession - myTId <- gets myTeamId me <- gets myUser knownUsers <- gets allUserIds + ts <- use csTeams doAsyncWith Preempt $ do - (chans, datas) <- runConcurrently $ (,) - <$> Concurrently (MM.mmGetChannelsForUser UserMe myTId session) - <*> Concurrently (MM.mmGetChannelMembersForUser UserMe myTId session) + pairs <- forM (HM.keys ts) $ \tId -> do + runConcurrently $ (,) + <$> Concurrently (MM.mmGetChannelsForUser UserMe tId session) + <*> Concurrently (MM.mmGetChannelMembersForUser UserMe tId session) + let (chans, datas) = (mconcat $ fst <$> pairs, mconcat $ snd <$> pairs) + -- Collect all user IDs associated with DM channels so we can -- bulk-fetch their user records. let dmUsers = catMaybes $ flip map (F.toList chans) $ \chan -> @@ -288,7 +247,7 @@ handleNewUsers (Seq.fromList uIdsToFetch) $ do -- Then refresh all loaded channels forM_ chansWithData $ uncurry (refreshChannel SidebarUpdateDeferred) - updateSidebar + updateSidebar Nothing -- | Refresh information about a specific channel. The channel -- metadata is refreshed, and if this is a loaded channel, the @@ -305,14 +264,16 @@ -- immediate setting is passed here. refreshChannel :: SidebarUpdate -> Channel -> ChannelMember -> MH () refreshChannel upd chan member = do - let cId = getId chan - myTId <- gets myTeamId - let ourTeam = channelTeamId chan == Nothing || - Just myTId == channelTeamId chan + ts <- use csTeams + let ourTeams = HM.keys ts + isOurTeam = case channelTeamId chan of + Nothing -> True + Just tId -> tId `elem` ourTeams - case not ourTeam of - True -> return () - False -> do + case isOurTeam of + False -> return () + True -> do + let cId = getId chan -- If this channel is unknown, register it first. mChan <- preuse (csChannel(cId)) when (isNothing mChan) $ @@ -402,7 +363,7 @@ -- switch to this channel when doing a sidebar -- update, since that's the only case where it's -- possible to do so. - updateSidebar + updateSidebar (cChannel^.ccInfo.cdTeamId) -- Finally, set our focus to the newly created -- channel if the caller requested a change of @@ -431,10 +392,11 @@ -- specified channel. checkPendingChannelChange :: ChannelId -> MH (Maybe (Maybe (MH ()))) checkPendingChannelChange cId = do - ch <- use csPendingChannelChange + ch <- use (csCurrentTeam.tsPendingChannelChange) + curTid <- use csCurrentTeamId return $ case ch of - Just (ChangeByChannelId i act) -> - if i == cId then Just act else Nothing + Just (ChangeByChannelId tId i act) -> + if i == cId && curTid == tId then Just act else Nothing _ -> Nothing -- | Check to see whether the specified channel has been queued up to @@ -448,7 +410,7 @@ -- specified channel. checkPendingChannelChangeByUserId :: UserId -> MH Bool checkPendingChannelChangeByUserId uId = do - ch <- use csPendingChannelChange + ch <- use (csCurrentTeam.tsPendingChannelChange) return $ case ch of Just (ChangeByUserId i) -> i == uId @@ -461,94 +423,37 @@ updateChannelInfo cid new member = do mh $ invalidateCacheEntry $ ChannelMessages cid csChannel(cid).ccInfo %= channelInfoFromChannelWithData new member - updateSidebar + withChannel cid $ \chan -> + updateSidebar (chan^.ccInfo.cdTeamId) setFocus :: ChannelId -> MH () setFocus cId = do showChannelInSidebar cId True setFocusWith True (Z.findRight ((== cId) . channelListEntryChannelId)) (return ()) -showChannelInSidebar :: ChannelId -> Bool -> MH () -showChannelInSidebar cId setPending = do - mChan <- preuse $ csChannel cId - me <- gets myUser - prefs <- use (csResources.crUserPreferences) - session <- getSession - - case mChan of - Nothing -> - -- The requested channel doesn't actually exist yet, so no - -- action can be taken. It's likely that this is a - -- pendingChannel situation and not all of the operations to - -- locally define the channel have completed, in which case - -- this code will be re-entered later and the mChan will be - -- known. - return () - Just ch -> do - - -- Able to successfully switch to a known channel. This - -- should clear any pending channel intention. If the - -- intention was for this channel, then: done. If the - -- intention was for a different channel, reaching this - -- point means that the pending is still outstanding but - -- that the user identified a new channel which *was* - -- displayable, and the UI should always prefer to SATISFY - -- the user's latest request over any pending/background - -- task. - csPendingChannelChange .= Nothing - - now <- liftIO getCurrentTime - csChannel(cId).ccInfo.cdSidebarShowOverride .= Just now - updateSidebar - - case ch^.ccInfo.cdType of - Direct -> do - let Just uId = ch^.ccInfo.cdDMUserId - case dmChannelShowPreference prefs uId of - Just False -> do - let pref = showDirectChannelPref (me^.userIdL) uId True - when setPending $ - csPendingChannelChange .= Just (ChangeByChannelId (ch^.ccInfo.cdChannelId) Nothing) - doAsyncWith Preempt $ do - MM.mmSaveUsersPreferences UserMe (Seq.singleton pref) session - return Nothing - _ -> return () - - Group -> - case groupChannelShowPreference prefs cId of - Just False -> do - let pref = showGroupChannelPref cId (me^.userIdL) - when setPending $ - csPendingChannelChange .= Just (ChangeByChannelId (ch^.ccInfo.cdChannelId) Nothing) - doAsyncWith Preempt $ do - MM.mmSaveUsersPreferences UserMe (Seq.singleton pref) session - return Nothing - _ -> return () - - _ -> return () - setFocusWith :: Bool -> (Zipper ChannelListGroup ChannelListEntry -> Zipper ChannelListGroup ChannelListEntry) -> MH () -> MH () setFocusWith updatePrev f onNoChange = do - oldZipper <- use csFocus + tId <- use csCurrentTeamId + oldZipper <- use (csCurrentTeam.tsFocus) let newZipper = f oldZipper newFocus = Z.focus newZipper oldFocus = Z.focus oldZipper -- If we aren't changing anything, skip all the book-keeping because - -- we'll end up clobbering things like csRecentChannel. + -- we'll end up clobbering things like tsRecentChannel. if newFocus /= oldFocus then do - mh $ invalidateCacheEntry ChannelSidebar + mh $ invalidateCacheEntry $ ChannelSidebar tId resetAutocomplete preChangeChannelCommon - csFocus .= newZipper + csCurrentTeam.tsFocus .= newZipper now <- liftIO getCurrentTime - newCid <- use csCurrentChannelId + newCid <- use (csCurrentChannelId tId) csChannel(newCid).ccInfo.cdSidebarShowOverride .= Just now updateViewed updatePrev @@ -564,90 +469,70 @@ loadLastEdit :: MH () loadLastEdit = do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) oldEphemeral <- preuse (csChannel(cId).ccEditState) case oldEphemeral of Nothing -> return () - Just e -> csEditState.cedEphemeral .= e + Just e -> csCurrentTeam.tsEditState.cedEphemeral .= e loadLastChannelInput loadLastChannelInput :: MH () loadLastChannelInput = do - cId <- use csCurrentChannelId - inputHistoryPos <- use (csEditState.cedEphemeral.eesInputHistoryPosition) + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) + inputHistoryPos <- use (csCurrentTeam.tsEditState.cedEphemeral.eesInputHistoryPosition) case inputHistoryPos of Just i -> loadHistoryEntryToEditor cId i Nothing -> do - (lastEdit, lastEditMode) <- use (csEditState.cedEphemeral.eesLastInput) - csEditState.cedEditor %= (applyEdit $ insertMany lastEdit . clearZipper) - csEditState.cedEditMode .= lastEditMode + (lastEdit, lastEditMode) <- use (csCurrentTeam.tsEditState.cedEphemeral.eesLastInput) + csCurrentTeam.tsEditState.cedEditor %= (applyEdit $ insertMany lastEdit . clearZipper) + csCurrentTeam.tsEditState.cedEditMode .= lastEditMode updateChannelListScroll :: MH () updateChannelListScroll = do - mh $ vScrollToBeginning (viewportScroll ChannelList) + tId <- use csCurrentTeamId + mh $ vScrollToBeginning (viewportScroll $ ChannelList tId) preChangeChannelCommon :: MH () preChangeChannelCommon = do - cId <- use csCurrentChannelId - csRecentChannel .= Just cId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) + csCurrentTeam.tsRecentChannel .= Just cId saveCurrentEdit resetEditorState :: MH () resetEditorState = do - csEditState.cedEditMode .= NewPost + csCurrentTeam.tsEditState.cedEditMode .= NewPost clearEditor clearEditor :: MH () -clearEditor = csEditState.cedEditor %= applyEdit clearZipper +clearEditor = csCurrentTeam.tsEditState.cedEditor %= applyEdit clearZipper saveCurrentEdit :: MH () saveCurrentEdit = do saveCurrentChannelInput - oldEphemeral <- use (csEditState.cedEphemeral) - cId <- use csCurrentChannelId + oldEphemeral <- use (csCurrentTeam.tsEditState.cedEphemeral) + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) csChannel(cId).ccEditState .= oldEphemeral saveCurrentChannelInput :: MH () saveCurrentChannelInput = do - cmdLine <- use (csEditState.cedEditor) - mode <- use (csEditState.cedEditMode) + cmdLine <- use (csCurrentTeam.tsEditState.cedEditor) + mode <- use (csCurrentTeam.tsEditState.cedEditMode) -- Only save the editor contents if the user is not navigating the -- history. - inputHistoryPos <- use (csEditState.cedEphemeral.eesInputHistoryPosition) + inputHistoryPos <- use (csCurrentTeam.tsEditState.cedEphemeral.eesInputHistoryPosition) when (isNothing inputHistoryPos) $ - csEditState.cedEphemeral.eesLastInput .= + csCurrentTeam.tsEditState.cedEphemeral.eesLastInput .= (T.intercalate "\n" $ getEditContents $ cmdLine, mode) -hideGroupChannelPref :: ChannelId -> UserId -> Preference -hideGroupChannelPref cId uId = - Preference { preferenceCategory = PreferenceCategoryGroupChannelShow - , preferenceValue = PreferenceValue "false" - , preferenceName = PreferenceName $ idString cId - , preferenceUserId = uId - } - -showGroupChannelPref :: ChannelId -> UserId -> Preference -showGroupChannelPref cId uId = - Preference { preferenceCategory = PreferenceCategoryGroupChannelShow - , preferenceValue = PreferenceValue "true" - , preferenceName = PreferenceName $ idString cId - , preferenceUserId = uId - } - -showDirectChannelPref :: UserId -> UserId -> Bool -> Preference -showDirectChannelPref myId otherId s = - Preference { preferenceCategory = PreferenceCategoryDirectChannelShow - , preferenceValue = if s then PreferenceValue "true" - else PreferenceValue "false" - , preferenceName = PreferenceName $ idString otherId - , preferenceUserId = myId - } - applyPreferenceChange :: Preference -> MH () applyPreferenceChange pref = do -- always update our user preferences accordingly @@ -661,8 +546,11 @@ | Just f <- preferenceToFlaggedPost pref -> do updateMessageFlag (flaggedPostId f) (flaggedPostStatus f) + | Just tIds <- preferenceToTeamOrder pref -> + applyTeamOrder tIds + | Just d <- preferenceToDirectChannelShowStatus pref -> do - updateSidebar + updateSidebar Nothing cs <- use csChannels @@ -683,7 +571,7 @@ csChannel(cId).ccInfo.cdSidebarShowOverride .= Nothing | Just g <- preferenceToGroupChannelPreference pref -> do - updateSidebar + updateSidebar Nothing -- We need to check on whether this preference was to show a -- channel and, if so, whether it was the one we attempted to @@ -716,16 +604,27 @@ removeChannelFromState cId = do withChannel cId $ \ chan -> do when (chan^.ccInfo.cdType /= Direct) $ do - origFocus <- use csCurrentChannelId - when (origFocus == cId) nextChannelSkipPrevView + case chan^.ccInfo.cdTeamId of + Nothing -> return () + Just tId -> do + origFocus <- use (csCurrentChannelId tId) + when (origFocus == cId) nextChannelSkipPrevView + -- Update input history - csEditState.cedInputHistory %= removeChannelHistory cId + csInputHistory %= removeChannelHistory cId -- Update msgMap - csChannels %= removeChannel cId - -- Remove from focus zipper - csFocus %= Z.filterZipper ((/= cId) . channelListEntryChannelId) - updateSidebar + csChannels %= removeChannel cId + case chan^.ccInfo.cdTeamId of + Nothing -> do + ts <- use csTeams + forM_ (HM.keys ts) $ \tId -> + csTeam(tId).tsFocus %= Z.filterZipper ((/= cId) . channelListEntryChannelId) + Just tId -> do + csTeam(tId).tsFocus %= Z.filterZipper ((/= cId) . channelListEntryChannelId) + + updateSidebar $ chan^.ccInfo.cdTeamId + nextChannel :: MH () nextChannel = do resetReturnChannel @@ -743,26 +642,27 @@ recentChannel :: MH () recentChannel = do - recent <- use csRecentChannel + recent <- use (csCurrentTeam.tsRecentChannel) case recent of Nothing -> return () Just cId -> do - ret <- use csReturnChannel + ret <- use (csCurrentTeam.tsReturnChannel) when (ret == Just cId) resetReturnChannel setFocus cId resetReturnChannel :: MH () resetReturnChannel = do - val <- use csReturnChannel + val <- use (csCurrentTeam.tsReturnChannel) case val of Nothing -> return () Just _ -> do - mh $ invalidateCacheEntry ChannelSidebar - csReturnChannel .= Nothing + tId <- use csCurrentTeamId + mh $ invalidateCacheEntry $ ChannelSidebar tId + csCurrentTeam.tsReturnChannel .= Nothing gotoReturnChannel :: MH () gotoReturnChannel = do - ret <- use csReturnChannel + ret <- use (csCurrentTeam.tsReturnChannel) case ret of Nothing -> return () Just cId -> do @@ -771,12 +671,13 @@ setReturnChannel :: MH () setReturnChannel = do - ret <- use csReturnChannel + ret <- use (csCurrentTeam.tsReturnChannel) case ret of Nothing -> do - cId <- use csCurrentChannelId - csReturnChannel .= Just cId - mh $ invalidateCacheEntry ChannelSidebar + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) + csCurrentTeam.tsReturnChannel .= Just cId + mh $ invalidateCacheEntry $ ChannelSidebar tId Just _ -> return () nextUnreadChannel :: MH () @@ -854,21 +755,23 @@ -- for the next candidate channel. Z.findRight (\e -> let cId = channelListEntryChannelId e - in hasUnread st cId && (cId /= st^.csCurrentChannelId)) + in hasUnread st cId && (cId /= st^.csCurrentChannelId(st^.csCurrentTeamId))) getNextUnreadUserOrChannel :: ChatState -> Zipper a ChannelListEntry -> Zipper a ChannelListEntry getNextUnreadUserOrChannel st z = -- Find the next unread channel, prefering direct messages - let cur = st^.csCurrentChannelId + let cur = st^.csCurrentChannelId(st^.csCurrentTeamId) matches e = entryIsDMEntry e && isFresh (channelListEntryChannelId e) isFresh c = hasUnread st c && (c /= cur) in fromMaybe (Z.findRight (isFresh . channelListEntryChannelId) z) (Z.maybeFindRight matches z) leaveCurrentChannel :: MH () -leaveCurrentChannel = use csCurrentChannelId >>= leaveChannel +leaveCurrentChannel = do + tId <- use csCurrentTeamId + use (csCurrentChannelId tId) >>= leaveChannel createGroupChannel :: Text -> MH () createGroupChannel usernameList = do @@ -893,7 +796,9 @@ -- we can just switch to it. setFocus (channelId chan) Nothing -> do - csPendingChannelChange .= (Just $ ChangeByChannelId (channelId chan) Nothing) + tId <- use csCurrentTeamId + csCurrentTeam.tsPendingChannelChange .= + (Just $ ChangeByChannelId tId (channelId chan) Nothing) let pref = showGroupChannelPref (channelId chan) (me^.userIdL) doAsyncWith Normal $ do MM.mmSaveUsersPreferences UserMe (Seq.singleton pref) session @@ -910,46 +815,48 @@ channelHistoryForward = do resetAutocomplete - cId <- use csCurrentChannelId - inputHistoryPos <- use (csEditState.cedEphemeral.eesInputHistoryPosition) + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) + inputHistoryPos <- use (csCurrentTeam.tsEditState.cedEphemeral.eesInputHistoryPosition) case inputHistoryPos of Just i | i == 0 -> do -- Transition out of history navigation - csEditState.cedEphemeral.eesInputHistoryPosition .= Nothing + csCurrentTeam.tsEditState.cedEphemeral.eesInputHistoryPosition .= Nothing loadLastChannelInput | otherwise -> do let newI = i - 1 loadHistoryEntryToEditor cId newI - csEditState.cedEphemeral.eesInputHistoryPosition .= (Just newI) + csCurrentTeam.tsEditState.cedEphemeral.eesInputHistoryPosition .= (Just newI) _ -> return () loadHistoryEntryToEditor :: ChannelId -> Int -> MH () loadHistoryEntryToEditor cId idx = do - inputHistory <- use (csEditState.cedInputHistory) + inputHistory <- use csInputHistory case getHistoryEntry cId idx inputHistory of Nothing -> return () Just entry -> do let eLines = T.lines entry mv = if length eLines == 1 then gotoEOL else id - csEditState.cedEditor.editContentsL .= (mv $ textZipper eLines Nothing) + csCurrentTeam.tsEditState.cedEditor.editContentsL .= (mv $ textZipper eLines Nothing) channelHistoryBackward :: MH () channelHistoryBackward = do resetAutocomplete - cId <- use csCurrentChannelId - inputHistoryPos <- use (csEditState.cedEphemeral.eesInputHistoryPosition) + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) + inputHistoryPos <- use (csCurrentTeam.tsEditState.cedEphemeral.eesInputHistoryPosition) saveCurrentChannelInput let newI = maybe 0 (+ 1) inputHistoryPos loadHistoryEntryToEditor cId newI - csEditState.cedEphemeral.eesInputHistoryPosition .= (Just newI) + csCurrentTeam.tsEditState.cedEphemeral.eesInputHistoryPosition .= (Just newI) createOrdinaryChannel :: Bool -> Text -> MH () createOrdinaryChannel public name = do session <- getSession - myTId <- gets myTeamId + myTId <- use csCurrentTeamId doAsyncWith Preempt $ do -- create a new chat channel let slug = T.map (\ c -> if isAlphaNum c then c else '-') (T.toLower name) @@ -986,7 +893,8 @@ addUserToCurrentChannel :: UserInfo -> MH () addUserToCurrentChannel u = do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) session <- getSession let channelMember = MinChannelMember (u^.uiId) cId doAsyncWith Normal $ do @@ -996,7 +904,8 @@ removeUserFromCurrentChannel :: Text -> MH () removeUserFromCurrentChannel uname = withFetchedUser (UserFetchByUsername uname) $ \u -> do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) session <- getSession doAsyncWith Normal $ do tryMM (void $ MM.mmRemoveUserFromChannel cId (UserById $ u^.uiId) session) @@ -1013,22 +922,23 @@ deleteCurrentChannel :: MH () deleteCurrentChannel = do setMode Main - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) leaveChannelIfPossible cId True isCurrentChannel :: ChatState -> ChannelId -> Bool -isCurrentChannel st cId = st^.csCurrentChannelId == cId +isCurrentChannel st cId = st^.csCurrentChannelId(st^.csCurrentTeamId) == cId isRecentChannel :: ChatState -> ChannelId -> Bool -isRecentChannel st cId = st^.csRecentChannel == Just cId +isRecentChannel st cId = st^.csCurrentTeam.tsRecentChannel == Just cId isReturnChannel :: ChatState -> ChannelId -> Bool -isReturnChannel st cId = st^.csReturnChannel == Just cId +isReturnChannel st cId = st^.csCurrentTeam.tsReturnChannel == Just cId joinChannelByName :: Text -> MH () joinChannelByName rawName = do session <- getSession - tId <- gets myTeamId + tId <- use csCurrentTeamId doAsyncWith Preempt $ do result <- try $ MM.mmGetChannelByName tId (trimChannelSigil rawName) session return $ Just $ case result of @@ -1050,8 +960,9 @@ fromMaybe (return ()) act Nothing -> do myId <- gets myUserId + tId <- use csCurrentTeamId let member = MinChannelMember myId chanId - csPendingChannelChange .= (Just $ ChangeByChannelId chanId act) + csCurrentTeam.tsPendingChannelChange .= (Just $ ChangeByChannelId tId chanId act) doAsyncChannelMM Preempt chanId (\ s c -> MM.mmAddUser c member s) (const $ return act) createOrFocusDMChannel :: UserInfo -> Maybe (ChannelId -> MH ()) -> MH () @@ -1067,7 +978,7 @@ -- We have a user of that name but no channel. Time to make one! myId <- gets myUserId session <- getSession - csPendingChannelChange .= (Just $ ChangeByUserId $ user^.uiId) + csCurrentTeam.tsPendingChannelChange .= (Just $ ChangeByUserId $ user^.uiId) doAsyncWith Normal $ do -- create a new channel chan <- MM.mmCreateDirectMessageChannel (user^.uiId, myId) session @@ -1108,12 +1019,27 @@ setChannelTopic :: Text -> MH () setChannelTopic msg = do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) let patch = defaultChannelPatch { channelPatchHeader = Just msg } doAsyncChannelMM Preempt cId (\s _ -> MM.mmPatchChannel cId patch s) (\_ _ -> Nothing) +-- | This renames the current channel's url name. It makes a request +-- to the server to change the name, but does not actually change the +-- name in Matterhorn yet; that is handled by a websocket event handled +-- asynchronously. +renameChannelUrl :: Text -> MH () +renameChannelUrl name = do + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) + s <- getSession + let patch = defaultChannelPatch { channelPatchName = Just name } + doAsyncWith Normal $ do + _ <- MM.mmPatchChannel cId patch s + return Nothing + getCurrentChannelTopic :: MH Text getCurrentChannelTopic = do ch <- use csCurrentChannel @@ -1121,7 +1047,8 @@ beginCurrentChannelDeleteConfirm :: MH () beginCurrentChannelDeleteConfirm = do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) withChannel cId $ \chan -> do let chType = chan^.ccInfo.cdType if chType /= Direct @@ -1130,5 +1057,11 @@ updateChannelNotifyProps :: ChannelId -> ChannelNotifyProps -> MH () updateChannelNotifyProps cId notifyProps = do - mh $ invalidateCacheEntry ChannelSidebar - csChannel(cId).ccInfo.cdNotifyProps .= notifyProps + withChannel cId $ \chan -> do + case chan^.ccInfo.cdTeamId of + Nothing -> do + ts <- use csTeams + forM_ (HM.keys ts) (mh . invalidateCacheEntry . ChannelSidebar) + Just tId -> mh $ invalidateCacheEntry $ ChannelSidebar tId + + csChannel(cId).ccInfo.cdNotifyProps .= notifyProps diff --git a/src/Matterhorn/State/Common.hs b/src/Matterhorn/State/Common.hs --- a/src/Matterhorn/State/Common.hs +++ b/src/Matterhorn/State/Common.hs @@ -67,19 +67,21 @@ -- This also sets the mFlagged field of each message based on whether -- its post ID is a flagged post according to crFlaggedPosts at the time -- of this call. -installMessagesFromPosts :: Posts -> MH Messages -installMessagesFromPosts postCollection = do +installMessagesFromPosts :: Maybe TeamId -> Posts -> MH Messages +installMessagesFromPosts mTId postCollection = do flags <- use (csResources.crFlaggedPosts) -- Add all posts in this collection to the global post cache - updatePostMap postCollection + updatePostMap mTId postCollection - baseUrl <- getServerBaseUrl + mBaseUrl <- case mTId of + Nothing -> return Nothing + Just tId -> Just <$> getServerBaseUrl tId -- Build the ordered list of posts. Note that postsOrder lists the -- posts most recent first, but we want most recent last. let postsInOrder = findPost <$> (Seq.reverse $ postsOrder postCollection) - mkClientPost p = toClientPost baseUrl p (postId <$> parent p) + mkClientPost p = toClientPost mBaseUrl p (postId <$> parent p) clientPosts = mkClientPost <$> postsInOrder addNext cp (msgs, us) = @@ -102,18 +104,21 @@ Just post -> post -- Add all posts in this collection to the global post cache -updatePostMap :: Posts -> MH () -updatePostMap postCollection = do +updatePostMap :: Maybe TeamId -> Posts -> MH () +updatePostMap mTId postCollection = do -- Build a map from post ID to Matterhorn message, then add the new -- messages to the global post map. We use the "postsPosts" field for -- this because that might contain more messages than the "postsOrder" -- list, since the former can contain other messages in threads that -- the server sent us, even if those messages are not part of the -- ordered post listing of "postsOrder." - baseUrl <- getServerBaseUrl + mBaseUrl <- case mTId of + Nothing -> return Nothing + Just tId -> Just <$> getServerBaseUrl tId + let postMap = HM.fromList [ ( pId - , fst $ clientPostToMessage (toClientPost baseUrl x Nothing) + , fst $ clientPostToMessage (toClientPost mBaseUrl x Nothing) ) | (pId, x) <- HM.toList (postCollection^.postsPostsL) ] @@ -122,13 +127,15 @@ -- | Add a 'ClientMessage' to the current channel's message list addClientMessage :: ClientMessage -> MH () addClientMessage msg = do - cid <- use csCurrentChannelId + tId <- use csCurrentTeamId + cid <- use (csCurrentChannelId(tId)) uuid <- generateUUID let addCMsg = ccContents.cdMessages %~ (addMessage $ clientMessageToMessage msg & mMessageId .~ Just (MessageUUID uuid)) csChannels %= modifyChannelById cid addCMsg + mh $ invalidateCacheEntry $ ChannelMessages cid - mh $ invalidateCacheEntry ChannelSidebar + mh $ invalidateCacheEntry $ ChannelSidebar tId let msgTy = case msg^.cmType of Error -> LogError @@ -152,7 +159,7 @@ postErrorMessageIO err st = do msg <- newClientMessage Error err uuid <- generateUUID_IO - let cId = st ^. csCurrentChannelId + let cId = st ^. csCurrentChannelId (st^.csCurrentTeamId) addEMsg = ccContents.cdMessages %~ (addMessage $ clientMessageToMessage msg & mMessageId .~ Just (MessageUUID uuid)) return $ st & csChannels %~ modifyChannelById cId addEMsg diff --git a/src/Matterhorn/State/Editing.hs b/src/Matterhorn/State/Editing.hs --- a/src/Matterhorn/State/Editing.hs +++ b/src/Matterhorn/State/Editing.hs @@ -49,7 +49,7 @@ import qualified System.Process as Sys import Text.Aspell ( AspellResponse(..), mistakeWord, askAspell ) -import Network.Mattermost.Types ( Post(..), ChannelId ) +import Network.Mattermost.Types ( Post(..), ChannelId, TeamId ) import Matterhorn.Config import {-# SOURCE #-} Matterhorn.Command ( dispatchCommand ) @@ -66,20 +66,20 @@ startMultilineEditing :: MH () startMultilineEditing = do mh invalidateCache - csEditState.cedEphemeral.eesMultiline .= True + csCurrentTeam.tsEditState.cedEphemeral.eesMultiline .= True toggleMultilineEditing :: MH () toggleMultilineEditing = do mh invalidateCache - csEditState.cedEphemeral.eesMultiline %= not + csCurrentTeam.tsEditState.cedEphemeral.eesMultiline %= not -- If multiline is now disabled and there is more than one line in -- the editor, that means we're showing the multiline message status -- (see Draw.Main.renderUserCommandBox.commandBox) so we want to be -- sure no autocomplete UI is present in case the cursor was left on -- a word that would otherwise show completion alternatives. - multiline <- use (csEditState.cedEphemeral.eesMultiline) - numLines <- use (csEditState.cedEditor.to getEditContents.to length) + multiline <- use (csCurrentTeam.tsEditState.cedEphemeral.eesMultiline) + numLines <- use (csCurrentTeam.tsEditState.cedEditor.to getEditContents.to length) when (not multiline && numLines > 1) resetAutocomplete invokeExternalEditor :: MH () @@ -96,7 +96,7 @@ Sys.withSystemTempFile "matterhorn_editor.md" $ \tmpFileName tmpFileHandle -> do -- Write the current message to the temp file Sys.hPutStr tmpFileHandle $ T.unpack $ T.intercalate "\n" $ - getEditContents $ st^.csEditState.cedEditor + getEditContents $ st^.csCurrentTeam.tsEditState.cedEditor Sys.hClose tmpFileHandle -- Run the editor @@ -112,26 +112,26 @@ postErrorMessageIO "Failed to decode file contents as UTF-8" st Right t -> do let tmpLines = T.lines $ sanitizeUserText' t - return $ st & csEditState.cedEditor.editContentsL .~ (Z.textZipper tmpLines Nothing) + return $ st & csCurrentTeam.tsEditState.cedEditor.editContentsL .~ (Z.textZipper tmpLines Nothing) Sys.ExitFailure _ -> return st handlePaste :: BS.ByteString -> MH () handlePaste bytes = do let pasteStr = T.pack (UTF8.toString bytes) - csEditState.cedEditor %= applyEdit (Z.insertMany (sanitizeUserText' pasteStr)) - contents <- use (csEditState.cedEditor.to getEditContents) + csCurrentTeam.tsEditState.cedEditor %= applyEdit (Z.insertMany (sanitizeUserText' pasteStr)) + contents <- use (csCurrentTeam.tsEditState.cedEditor.to getEditContents) case length contents > 1 of True -> startMultilineEditing False -> return () editingPermitted :: ChatState -> Bool editingPermitted st = - (length (getEditContents $ st^.csEditState.cedEditor) == 1) || - st^.csEditState.cedEphemeral.eesMultiline + (length (getEditContents $ st^.csCurrentTeam.tsEditState.cedEditor) == 1) || + st^.csCurrentTeam.tsEditState.cedEphemeral.eesMultiline messageEditingKeybindings :: KeyConfig -> KeyHandlerMap messageEditingKeybindings kc = - let KeyHandlerMap m = editingKeybindings (csEditState.cedEditor) kc + let KeyHandlerMap m = editingKeybindings (csCurrentTeam.tsEditState.cedEditor) kc in KeyHandlerMap $ M.map withUserTypingAction m withUserTypingAction :: KeyHandler -> KeyHandler @@ -167,7 +167,7 @@ "Kill the line to the right of the current position and copy it" $ do z <- use (editor.editContentsL) let restOfLine = Z.currentLine (Z.killToBOL z) - csEditState.cedYankBuffer .= restOfLine + csCurrentTeam.tsEditState.cedYankBuffer .= restOfLine editor %= applyEdit Z.killToEOL , mkKb EditorNextCharEvent "Move one character to the right" @@ -195,13 +195,13 @@ editor %= applyEdit gotoEnd , mkKb EditorYankEvent "Paste the current buffer contents at the cursor" $ do - buf <- use (csEditState.cedYankBuffer) + buf <- use (csCurrentTeam.tsEditState.cedYankBuffer) editor %= applyEdit (Z.insertMany buf) ] getEditorContent :: MH Text getEditorContent = do - cmdLine <- use (csEditState.cedEditor) + cmdLine <- use (csCurrentTeam.tsEditState.cedEditor) let (line:rest) = getEditContents cmdLine return $ T.intercalate "\n" $ line : rest @@ -216,21 +216,22 @@ -- *source* of the text, so it also takes care of clearing the editor, -- resetting the edit mode, updating the input history for the specified -- channel, etc. -handleInputSubmission :: ChannelId -> Text -> MH () -handleInputSubmission cId content = do +handleInputSubmission :: TeamId -> ChannelId -> Text -> MH () +handleInputSubmission tId cId content = do -- We clean up before dispatching the command or sending the message -- since otherwise the command could change the state and then doing -- cleanup afterwards could clean up the wrong things. - csEditState.cedEditor %= applyEdit Z.clearZipper - csEditState.cedInputHistory %= addHistoryEntry content cId - csEditState.cedEphemeral.eesInputHistoryPosition .= Nothing + csTeam(tId).tsEditState.cedEditor %= applyEdit Z.clearZipper + csTeam(tId).tsEditState.cedEphemeral.eesInputHistoryPosition .= Nothing + csInputHistory %= addHistoryEntry content cId + case T.uncons content of Just ('/', cmd) -> dispatchCommand cmd _ -> do - attachments <- use (csEditState.cedAttachmentList.L.listElementsL) - mode <- use (csEditState.cedEditMode) + attachments <- use (csTeam(tId).tsEditState.cedAttachmentList.L.listElementsL) + mode <- use (csTeam(tId).tsEditState.cedEditMode) sendMessage cId mode content $ F.toList attachments -- Reset the autocomplete UI @@ -241,7 +242,7 @@ -- Reset the edit mode *after* handling the input so that the input -- handler can tell whether we're editing, replying, etc. - csEditState.cedEditMode .= NewPost + csTeam(tId).tsEditState.cedEditMode .= NewPost closingPunctuationMarks :: String closingPunctuationMarks = ".,'\";:)]!?" @@ -262,18 +263,18 @@ -- Record the input line count before handling the editing event -- so we can tell whether the editing event changes the line count -- later. - beforeLineCount <- use (csEditState.cedEditor.to getEditContents.to length) + beforeLineCount <- use (csCurrentTeam.tsEditState.cedEditor.to getEditContents.to length) - smartBacktick <- use (csResources.crConfiguration.to configSmartBacktick) + smartBacktick <- use (csResources.crConfiguration.configSmartBacktickL) let smartChars = "*`_" st <- use id - csEditState.cedEphemeral.eesInputHistoryPosition .= Nothing + csCurrentTeam.tsEditState.cedEphemeral.eesInputHistoryPosition .= Nothing - smartEditing <- use (csResources.crConfiguration.to configSmartEditing) - justCompleted <- use (csEditState.cedJustCompleted) + smartEditing <- use (csResources.crConfiguration.configSmartEditingL) + justCompleted <- use (csCurrentTeam.tsEditState.cedJustCompleted) conf <- use (csResources.crConfiguration) - let keyMap = editingKeybindings (csEditState.cedEditor) (configUserKeys conf) + let keyMap = editingKeybindings (csCurrentTeam.tsEditState.cedEditor) (configUserKeys conf) case lookupKeybinding e keyMap of Just kb | editingPermitted st -> (ehAction $ kehHandler $ khHandler kb) _ -> do @@ -281,52 +282,52 @@ -- Not editing; backspace here means cancel multi-line message -- composition EvKey KBS [] | (not $ editingPermitted st) -> - csEditState.cedEditor %= applyEdit Z.clearZipper + csCurrentTeam.tsEditState.cedEditor %= applyEdit Z.clearZipper -- Backspace in editing mode with smart pair insertion means -- smart pair removal when possible EvKey KBS [] | editingPermitted st && smartBacktick -> - let backspace = csEditState.cedEditor %= applyEdit Z.deletePrevChar - in case cursorAtOneOf smartChars (st^.csEditState.cedEditor) of + let backspace = csCurrentTeam.tsEditState.cedEditor %= applyEdit Z.deletePrevChar + in case cursorAtOneOf smartChars (st^.csCurrentTeam.tsEditState.cedEditor) of Nothing -> backspace Just ch -> -- Smart char removal: - if | (cursorAtChar ch $ applyEdit Z.moveLeft $ st^.csEditState.cedEditor) && - (cursorIsAtEnd $ applyEdit Z.moveRight $ st^.csEditState.cedEditor) -> - csEditState.cedEditor %= applyEdit (Z.deleteChar >>> Z.deletePrevChar) + if | (cursorAtChar ch $ applyEdit Z.moveLeft $ st^.csCurrentTeam.tsEditState.cedEditor) && + (cursorIsAtEnd $ applyEdit Z.moveRight $ st^.csCurrentTeam.tsEditState.cedEditor) -> + csCurrentTeam.tsEditState.cedEditor %= applyEdit (Z.deleteChar >>> Z.deletePrevChar) | otherwise -> backspace EvKey (KChar ch) [] | editingPermitted st && smartBacktick && ch `elem` smartChars -> -- Smart char insertion: let doInsertChar = do - csEditState.cedEditor %= applyEdit (Z.insertChar ch) + csCurrentTeam.tsEditState.cedEditor %= applyEdit (Z.insertChar ch) sendUserTypingAction - curLine = Z.currentLine $ st^.csEditState.cedEditor.editContentsL + curLine = Z.currentLine $ st^.csCurrentTeam.tsEditState.cedEditor.editContentsL -- First case: if the cursor is at the end of the current -- line and it contains "``" and the user entered a third -- "`", enable multi-line mode since they're likely typing -- a code block. - in if | (cursorIsAtEnd $ st^.csEditState.cedEditor) && + in if | (cursorIsAtEnd $ st^.csCurrentTeam.tsEditState.cedEditor) && curLine == "``" && ch == '`' -> do - csEditState.cedEditor %= applyEdit (Z.insertMany (T.singleton ch)) - csEditState.cedEphemeral.eesMultiline .= True + csCurrentTeam.tsEditState.cedEditor %= applyEdit (Z.insertMany (T.singleton ch)) + csCurrentTeam.tsEditState.cedEphemeral.eesMultiline .= True -- Second case: user entered some smart character -- (don't care which) on an empty line or at the end -- of the line after whitespace, so enter a pair of -- the smart chars and put the cursor between them. - | (editorEmpty $ st^.csEditState.cedEditor) || - ((cursorAtChar ' ' (applyEdit Z.moveLeft $ st^.csEditState.cedEditor)) && - (cursorIsAtEnd $ st^.csEditState.cedEditor)) -> - csEditState.cedEditor %= applyEdit (Z.insertMany (T.pack $ ch:ch:[]) >>> Z.moveLeft) + | (editorEmpty $ st^.csCurrentTeam.tsEditState.cedEditor) || + ((cursorAtChar ' ' (applyEdit Z.moveLeft $ st^.csCurrentTeam.tsEditState.cedEditor)) && + (cursorIsAtEnd $ st^.csCurrentTeam.tsEditState.cedEditor)) -> + csCurrentTeam.tsEditState.cedEditor %= applyEdit (Z.insertMany (T.pack $ ch:ch:[]) >>> Z.moveLeft) -- Third case: the cursor is already on a smart -- character and that character is the last one -- on the line, so instead of inserting a new -- character, just move past it. - | (cursorAtChar ch $ st^.csEditState.cedEditor) && - (cursorIsAtEnd $ applyEdit Z.moveRight $ st^.csEditState.cedEditor) -> - csEditState.cedEditor %= applyEdit Z.moveRight + | (cursorAtChar ch $ st^.csCurrentTeam.tsEditState.cedEditor) && + (cursorIsAtEnd $ applyEdit Z.moveRight $ st^.csCurrentTeam.tsEditState.cedEditor) -> + csCurrentTeam.tsEditState.cedEditor %= applyEdit Z.moveRight -- Fall-through case: just insert one of the chars -- without doing anything smart. | otherwise -> doInsertChar @@ -336,12 +337,12 @@ -- there is a trailing space that we want to remove if the -- next input character is punctuation. when (smartEditing && justCompleted && isSmartClosingPunctuation e) $ - csEditState.cedEditor %= applyEdit Z.deletePrevChar + csCurrentTeam.tsEditState.cedEditor %= applyEdit Z.deletePrevChar - csEditState.cedEditor %= applyEdit (Z.insertMany (sanitizeUserText' $ T.singleton ch)) + csCurrentTeam.tsEditState.cedEditor %= applyEdit (Z.insertMany (sanitizeUserText' $ T.singleton ch)) sendUserTypingAction _ | editingPermitted st -> do - mhHandleEventLensed (csEditState.cedEditor) handleEditorEvent e + mhHandleEventLensed (csCurrentTeam.tsEditState.cedEditor) handleEditorEvent e sendUserTypingAction | otherwise -> return () @@ -349,23 +350,24 @@ , autocompleteFirstMatch = False } checkForAutocompletion ctx - liftIO $ resetSpellCheckTimer $ st^.csEditState + liftIO $ resetSpellCheckTimer $ st^.csCurrentTeam.tsEditState -- If the preview is enabled and multi-line editing is enabled and -- the line count changed, we need to invalidate the rendering cache -- entry for the channel messages because we want to redraw them to -- fit in the space just changed by the size of the preview area. - afterLineCount <- use (csEditState.cedEditor.to getEditContents.to length) - isMultiline <- use (csEditState.cedEphemeral.eesMultiline) - isPreviewing <- use csShowMessagePreview + afterLineCount <- use (csCurrentTeam.tsEditState.cedEditor.to getEditContents.to length) + isMultiline <- use (csCurrentTeam.tsEditState.cedEphemeral.eesMultiline) + isPreviewing <- use (csResources.crConfiguration.configShowMessagePreviewL) when (beforeLineCount /= afterLineCount && isMultiline && isPreviewing) $ do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) mh $ invalidateCacheEntry $ ChannelMessages cId -- Reset the recent autocompletion flag to stop smart punctuation -- handling. when justCompleted $ - csEditState.cedJustCompleted .= False + csCurrentTeam.tsEditState.cedJustCompleted .= False -- | Send the user_typing action to the server asynchronously, over the -- connected websocket. If the websocket is not connected, drop the @@ -376,12 +378,13 @@ when (configShowTypingIndicator (st^.csResources.crConfiguration)) $ case st^.csConnectionStatus of Connected -> do - let pId = case st^.csEditState.cedEditMode of + let pId = case st^.csCurrentTeam.tsEditState.cedEditMode of Replying _ post -> Just $ postId post _ -> Nothing + tId <- use csCurrentTeamId liftIO $ do now <- getCurrentTime - let action = UserTyping now (st^.csCurrentChannelId) pId + let action = UserTyping now (st^.csCurrentChannelId(tId)) pId STM.atomically $ STM.writeTChan (st^.csResources.crWebsocketActionChan) action Disconnected -> return () @@ -390,11 +393,12 @@ requestSpellCheck :: MH () requestSpellCheck = do st <- use id - case st^.csEditState.cedSpellChecker of + case st^.csCurrentTeam.tsEditState.cedSpellChecker of Nothing -> return () Just (checker, _) -> do -- Get the editor contents. - contents <- getEditContents <$> use (csEditState.cedEditor) + tId <- use csCurrentTeamId + contents <- getEditContents <$> use (csTeam(tId).tsEditState.cedEditor) doAsyncWith Preempt $ do -- For each line in the editor, submit an aspell request. let query = concat <$> mapM (askAspell checker) contents @@ -403,7 +407,7 @@ let getMistakes AllCorrect = [] getMistakes (Mistakes ms) = mistakeWord <$> ms allMistakes = S.fromList $ concat $ getMistakes <$> responses - csEditState.cedMisspellings .= allMistakes + csTeam(tId).tsEditState.cedMisspellings .= allMistakes tryMM query (return . Just . postMistakes) @@ -452,19 +456,20 @@ cancelAutocompleteOrReplyOrEdit :: MH () cancelAutocompleteOrReplyOrEdit = do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) mh $ invalidateCacheEntry $ ChannelMessages cId - ac <- use (csEditState.cedAutocomplete) + ac <- use (csCurrentTeam.tsEditState.cedAutocomplete) case ac of Just _ -> do resetAutocomplete Nothing -> do - mode <- use (csEditState.cedEditMode) + mode <- use (csCurrentTeam.tsEditState.cedEditMode) case mode of NewPost -> return () _ -> do - csEditState.cedEditMode .= NewPost - csEditState.cedEditor %= applyEdit Z.clearZipper + csCurrentTeam.tsEditState.cedEditMode .= NewPost + csCurrentTeam.tsEditState.cedEditor %= applyEdit Z.clearZipper resetAttachmentList replyToLatestMessage :: MH () @@ -474,9 +479,10 @@ Just msg | isReplyable msg -> do rootMsg <- getReplyRootMessage msg setMode Main - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) mh $ invalidateCacheEntry $ ChannelMessages cId - csEditState.cedEditMode .= Replying rootMsg (fromJust $ rootMsg^.mOriginalPost) + csCurrentTeam.tsEditState.cedEditMode .= Replying rootMsg (fromJust $ rootMsg^.mOriginalPost) _ -> return () data Direction = Forwards | Backwards @@ -496,9 +502,9 @@ (L.listSelected list == Nothing && len > 0) then L.listMoveTo (len - 1) list else L.listMoveBy (-1) list - csEditState.cedAutocomplete._Just.acCompletionList %= transform + csCurrentTeam.tsEditState.cedAutocomplete._Just.acCompletionList %= transform - mac <- use (csEditState.cedAutocomplete) + mac <- use (csCurrentTeam.tsEditState.cedAutocomplete) case mac of Nothing -> do let ctx = AutocompleteContext { autocompleteManual = True @@ -514,10 +520,10 @@ if maybe True isSpace (Z.currentChar z) then z else Z.moveWordRight z - csEditState.cedEditor %= + csCurrentTeam.tsEditState.cedEditor %= applyEdit (Z.insertChar ' ' . Z.insertMany replacement . Z.deletePrevWord . maybeEndOfWord) - csEditState.cedJustCompleted .= True + csCurrentTeam.tsEditState.cedJustCompleted .= True -- If there was only one completion alternative, -- hide the autocomplete listing now that we've diff --git a/src/Matterhorn/State/Flagging.hs b/src/Matterhorn/State/Flagging.hs --- a/src/Matterhorn/State/Flagging.hs +++ b/src/Matterhorn/State/Flagging.hs @@ -9,6 +9,7 @@ import Data.Function ( on ) import qualified Data.Set as Set +import qualified Data.HashMap.Strict as HM import Lens.Micro.Platform import Network.Mattermost.Types @@ -38,29 +39,42 @@ msgMb <- use (csPostMap.at(pId)) case msgMb of Just msg - | Just cId <- msg^.mChannelId -> do + | Just cId <- msg^.mChannelId -> withChannel cId $ \chan -> do let isTargetMessage m = m^.mMessageId == Just (MessagePostId pId) csChannel(cId).ccContents.cdMessages.traversed.filtered isTargetMessage.mFlagged .= f csPostMap.ix(pId).mFlagged .= f - -- We also want to update the post overlay if this happens while - -- we're we're observing it - mode <- gets appMode - case mode of - PostListOverlay PostListFlagged - | f -> - csPostListOverlay.postListPosts %= - addMessage (msg & mFlagged .~ True) - -- deleting here is tricky, because it means that we need to - -- move the focus somewhere: we'll try moving it _up_ unless - -- we can't, in which case we'll try moving it down. - | otherwise -> do - selId <- use (csPostListOverlay.postListSelected) - posts <- use (csPostListOverlay.postListPosts) - let nextId = case getNextPostId selId posts of - Nothing -> getPrevPostId selId posts - Just x -> Just x - csPostListOverlay.postListSelected .= nextId - csPostListOverlay.postListPosts %= - filterMessages (((/=) `on` _mMessageId) msg) - _ -> return () + + let mTId = chan^.ccInfo.cdTeamId + updatePostOverlay :: TeamId -> MH () + updatePostOverlay tId = do + -- We also want to update the post overlay if this happens + -- while we're we're observing it + mode <- use (csTeam tId.tsMode) + case mode of + PostListOverlay PostListFlagged + | f -> + csTeam tId.tsPostListOverlay.postListPosts %= + addMessage (msg & mFlagged .~ True) + + -- deleting here is tricky, because it means that we + -- need to move the focus somewhere: we'll try moving + -- it _up_ unless we can't, in which case we'll try + -- moving it down. + | otherwise -> do + selId <- use (csTeam tId.tsPostListOverlay.postListSelected) + posts <- use (csTeam tId.tsPostListOverlay.postListPosts) + let nextId = case getNextPostId selId posts of + Nothing -> getPrevPostId selId posts + Just x -> Just x + csTeam tId.tsPostListOverlay.postListSelected .= nextId + csTeam tId.tsPostListOverlay.postListPosts %= + filterMessages (((/=) `on` _mMessageId) msg) + _ -> return () + + case mTId of + Nothing -> do + ts <- use csTeams + forM_ (HM.keys ts) updatePostOverlay + Just tId -> updatePostOverlay tId + _ -> return () diff --git a/src/Matterhorn/State/Help.hs b/src/Matterhorn/State/Help.hs --- a/src/Matterhorn/State/Help.hs +++ b/src/Matterhorn/State/Help.hs @@ -13,7 +13,7 @@ showHelpScreen :: HelpTopic -> MH () showHelpScreen topic = do - curMode <- gets appMode + curMode <- use (csCurrentTeam.tsMode) case curMode of ShowHelp {} -> return () _ -> do diff --git a/src/Matterhorn/State/MessageSelect.hs b/src/Matterhorn/State/MessageSelect.hs --- a/src/Matterhorn/State/MessageSelect.hs +++ b/src/Matterhorn/State/MessageSelect.hs @@ -54,9 +54,9 @@ getSelectedMessage :: ChatState -> Maybe Message getSelectedMessage st - | not (appMode st `elem` messageSelectCompatibleModes) = Nothing + | not (st^.csCurrentTeam.tsMode `elem` messageSelectCompatibleModes) = Nothing | otherwise = do - selMsgId <- selectMessageId $ st^.csMessageSelect + selMsgId <- selectMessageId $ st^.csCurrentTeam.tsMessageSelect let chanMsgs = st ^. csCurrentChannel . ccContents . cdMessages findMessage selMsgId chanMsgs @@ -74,7 +74,7 @@ when (isJust recentMsg) $ do setMode MessageSelect - csMessageSelect .= MessageSelectState (recentMsg >>= _mMessageId) + csCurrentTeam.tsMessageSelect .= MessageSelectState (recentMsg >>= _mMessageId) -- | Tell the server that the message we currently have selected -- should have its flagged state toggled. @@ -111,14 +111,16 @@ selected <- use (to getSelectedMessage) case selected of Just msg - | isGap msg -> do cId <- use csCurrentChannelId + | isGap msg -> do tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) asyncFetchMessagesForGap cId msg _ -> return () viewMessage :: Message -> MH () viewMessage m = do - let w = tabbedWindow VMTabMessage viewMessageWindowTemplate MessageSelect (78, 25) - csViewedMessage .= Just (m, w) + tId <- use csCurrentTeamId + let w = tabbedWindow VMTabMessage (viewMessageWindowTemplate tId) MessageSelect (78, 25) + csCurrentTeam.tsViewedMessage .= Just (m, w) runTabShowHandlerFor (twValue w) w setMode ViewMessage @@ -168,23 +170,23 @@ messageSelectUp :: MH () messageSelectUp = do - mode <- gets appMode - selected <- use (csMessageSelect.to selectMessageId) + mode <- use (csCurrentTeam.tsMode) + selected <- use (csCurrentTeam.tsMessageSelect.to selectMessageId) case selected of Just _ | mode == MessageSelect -> do chanMsgs <- use (csCurrentChannel.ccContents.cdMessages) let nextMsgId = getPrevMessageId selected chanMsgs - csMessageSelect .= MessageSelectState (nextMsgId <|> selected) + csCurrentTeam.tsMessageSelect .= MessageSelectState (nextMsgId <|> selected) _ -> return () messageSelectDown :: MH () messageSelectDown = do - selected <- use (csMessageSelect.to selectMessageId) + selected <- use (csCurrentTeam.tsMessageSelect.to selectMessageId) case selected of Just _ -> whenMode MessageSelect $ do chanMsgs <- use (csCurrentChannel.ccContents.cdMessages) let nextMsgId = getNextMessageId selected chanMsgs - csMessageSelect .= MessageSelectState (nextMsgId <|> selected) + csCurrentTeam.tsMessageSelect .= MessageSelectState (nextMsgId <|> selected) _ -> return () messageSelectDownBy :: Int -> MH () @@ -201,25 +203,25 @@ messageSelectFirst :: MH () messageSelectFirst = do - selected <- use (csMessageSelect.to selectMessageId) + selected <- use (csCurrentTeam.tsMessageSelect.to selectMessageId) case selected of Just _ -> whenMode MessageSelect $ do chanMsgs <- use (csCurrentChannel.ccContents.cdMessages) case getEarliestSelectableMessage chanMsgs of Just firstMsg -> - csMessageSelect .= MessageSelectState (firstMsg^.mMessageId <|> selected) + csCurrentTeam.tsMessageSelect .= MessageSelectState (firstMsg^.mMessageId <|> selected) Nothing -> mhLog LogError "No first message found from current message?!" _ -> return () messageSelectLast :: MH () messageSelectLast = do - selected <- use (csMessageSelect.to selectMessageId) + selected <- use (csCurrentTeam.tsMessageSelect.to selectMessageId) case selected of Just _ -> whenMode MessageSelect $ do chanMsgs <- use (csCurrentChannel.ccContents.cdMessages) case getLatestSelectableMessage chanMsgs of Just lastSelMsg -> - csMessageSelect .= MessageSelectState (lastSelMsg^.mMessageId <|> selected) + csCurrentTeam.tsMessageSelect .= MessageSelectState (lastSelMsg^.mMessageId <|> selected) Nothing -> mhLog LogError "No last message found from current message?!" _ -> return () @@ -227,7 +229,8 @@ deleteSelectedMessage = do selectedMessage <- use (to getSelectedMessage) st <- use id - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) case selectedMessage of Just msg | isMine st msg && isDeletable msg -> case msg^.mOriginalPost of @@ -235,7 +238,7 @@ doAsyncChannelMM Preempt cId (\s _ -> MM.mmDeletePost (postId p) s) (\_ _ -> Just $ do - csEditState.cedEditMode .= NewPost + csCurrentTeam.tsEditState.cedEditMode .= NewPost setMode Main) Nothing -> return () _ -> return () @@ -248,7 +251,7 @@ rootMsg <- getReplyRootMessage msg let Just p = rootMsg^.mOriginalPost setMode Main - csEditState.cedEditMode .= Replying rootMsg p + csCurrentTeam.tsEditState.cedEditMode .= Replying rootMsg p _ -> return () beginEditMessage :: MH () @@ -259,7 +262,7 @@ Just msg | isMine st msg && isEditable msg -> do let Just p = msg^.mOriginalPost setMode Main - csEditState.cedEditMode .= Editing p (msg^.mType) + csCurrentTeam.tsEditState.cedEditMode .= Editing p (msg^.mType) -- If the post that we're editing is an emote, we need -- to strip the formatting because that's only there to -- indicate that the post is an emote. This is annoying and @@ -271,7 +274,7 @@ let toEdit = if isEmote msg then removeEmoteFormatting sanitized else sanitized - csEditState.cedEditor %= applyEdit (insertMany toEdit . clearZipper) + csCurrentTeam.tsEditState.cedEditor %= applyEdit (insertMany toEdit . clearZipper) _ -> return () -- | Tell the server that we have flagged or unflagged a message. diff --git a/src/Matterhorn/State/Messages.hs b/src/Matterhorn/State/Messages.hs --- a/src/Matterhorn/State/Messages.hs +++ b/src/Matterhorn/State/Messages.hs @@ -151,22 +151,27 @@ editMessage :: Post -> MH () editMessage new = do myId <- gets myUserId - baseUrl <- getServerBaseUrl - let isEditedMessage m = m^.mMessageId == Just (MessagePostId $ new^.postIdL) - (msg, mentionedUsers) = clientPostToMessage (toClientPost baseUrl new (new^.postRootIdL)) - chan = csChannel (new^.postChannelIdL) - chan . ccContents . cdMessages . traversed . filtered isEditedMessage .= msg - mh $ invalidateCacheEntry (ChannelMessages $ new^.postChannelIdL) + withChannel (new^.postChannelIdL) $ \chan -> do + let mTId = chan^.ccInfo.cdTeamId + mBaseUrl <- case mTId of + Nothing -> return Nothing + Just tId -> Just <$> getServerBaseUrl tId - fetchMentionedUsers mentionedUsers + let (msg, mentionedUsers) = clientPostToMessage (toClientPost mBaseUrl new (new^.postRootIdL)) + isEditedMessage m = m^.mMessageId == Just (MessagePostId $ new^.postIdL) - when (postUserId new /= Just myId) $ - chan %= adjustEditedThreshold new + csChannel (new^.postChannelIdL) . ccContents . cdMessages . traversed . filtered isEditedMessage .= msg + mh $ invalidateCacheEntry (ChannelMessages $ new^.postChannelIdL) - csPostMap.ix(postId new) .= msg - asyncFetchReactionsForPost (postChannelId new) new - asyncFetchAttachments new + fetchMentionedUsers mentionedUsers + when (postUserId new /= Just myId) $ + csChannel (new^.postChannelIdL) %= adjustEditedThreshold new + + csPostMap.ix(postId new) .= msg + asyncFetchReactionsForPost (postChannelId new) new + asyncFetchAttachments new + deleteMessage :: Post -> MH () deleteMessage new = do let isDeletedMessage m = m^.mMessageId == Just (MessagePostId $ new^.postIdL) || @@ -210,6 +215,7 @@ -- case the new block should be surrounded by UnknownGaps. withChannelOrDefault cId NoAction $ \chan -> do let pIdList = toList (posts^.postsOrderL) + mTId = chan^.ccInfo.cdTeamId -- the first and list PostId in the batch to be added earliestPId = last pIdList latestPId = head pIdList @@ -300,7 +306,7 @@ -- usernames in the text of the messages which we need to use to -- submit a single batch request for user metadata so we don't -- submit one request per mention. - void $ installMessagesFromPosts posts + void $ installMessagesFromPosts mTId posts -- Add all the new *unique* posts into the existing channel -- corpus, generating needed fetches of data associated with @@ -338,82 +344,88 @@ csChannels %= modifyChannelById cId (ccContents.cdMessages .~ resultMessages) - -- Determine if the current selected message was one of the - -- removed messages. + let processTeam tId = do + -- Determine if the current selected message was one of the + -- removed messages. + selMsgId <- use (csTeam(tId).tsMessageSelect.to selectMessageId) + let rmvdSel = do + i <- selMsgId -- :: Maybe MessageId + findMessage i removedMessages + rmvdSelType = _mType <$> rmvdSel - selMsgId <- use (csMessageSelect.to selectMessageId) - let rmvdSel = do - i <- selMsgId -- :: Maybe MessageId - findMessage i removedMessages - rmvdSelType = _mType <$> rmvdSel + case rmvdSel of + Nothing -> return () + Just rm -> + if isGap rm + then return () -- handled during gap insertion below + else do + -- Replaced a selected message that wasn't a gap. + -- This is unlikely, but may occur if the previously + -- selected message was just deleted by another user + -- and is in the fetched region. The choices here are + -- to move the selection, or cancel the selection. + -- Both will be unpleasant surprises for the user, but + -- cancelling the selection is probably the better + -- choice than allowing the user to perform select + -- actions on a message that isn't the one they just + -- selected. + setMode Main + csTeam(tId).tsMessageSelect .= MessageSelectState Nothing - case rmvdSel of - Nothing -> return () - Just rm -> - if isGap rm - then return () -- handled during gap insertion below - else do - -- Replaced a selected message that wasn't a gap. - -- This is unlikely, but may occur if the previously - -- selected message was just deleted by another user - -- and is in the fetched region. The choices here are - -- to move the selection, or cancel the selection. - -- Both will be unpleasant surprises for the user, but - -- cancelling the selection is probably the better - -- choice than allowing the user to perform select - -- actions on a message that isn't the one they just - -- selected. - setMode Main - csMessageSelect .= MessageSelectState Nothing + -- Add a gap at each end of the newly fetched data, unless: + -- 1. there is an overlap + -- 2. there is no more in the indicated direction + -- a. indicated by adding messages later than any currently + -- held messages (see note above re 'addingAtEnd'). + -- b. the amount returned was less than the amount requested - -- Add a gap at each end of the newly fetched data, unless: - -- 1. there is an overlap - -- 2. there is no more in the indicated direction - -- a. indicated by adding messages later than any currently - -- held messages (see note above re 'addingAtEnd'). - -- b. the amount returned was less than the amount requested + if reAddGapBefore + then + -- No more gaps. If the selected gap was removed, move + -- select to first (earliest) message) + case rmvdSelType of + Just (C UnknownGapBefore) -> + csTeam(tId).tsMessageSelect .= MessageSelectState (pure $ MessagePostId earliestPId) + _ -> return () + else do + -- add a gap at the start of the newly fetched block and + -- make that the active selection if this fetch removed + -- the previously selected gap in this direction. + gapMsg <- newGapMessage (justBefore earliestDate) True + csChannels %= modifyChannelById cId + (ccContents.cdMessages %~ addMessage gapMsg) + -- Move selection from old gap to new gap + case rmvdSelType of + Just (C UnknownGapBefore) -> do + csTeam(tId).tsMessageSelect .= MessageSelectState (gapMsg^.mMessageId) + _ -> return () - if reAddGapBefore - then - -- No more gaps. If the selected gap was removed, move - -- select to first (earliest) message) - case rmvdSelType of - Just (C UnknownGapBefore) -> - csMessageSelect .= MessageSelectState (pure $ MessagePostId earliestPId) - _ -> return () - else do - -- add a gap at the start of the newly fetched block and - -- make that the active selection if this fetch removed - -- the previously selected gap in this direction. - gapMsg <- newGapMessage (justBefore earliestDate) True - csChannels %= modifyChannelById cId - (ccContents.cdMessages %~ addMessage gapMsg) - -- Move selection from old gap to new gap - case rmvdSelType of - Just (C UnknownGapBefore) -> do - csMessageSelect .= MessageSelectState (gapMsg^.mMessageId) - _ -> return () + if reAddGapAfter + then + -- No more gaps. If the selected gap was removed, move + -- select to last (latest) message. + case rmvdSelType of + Just (C UnknownGapAfter) -> + csTeam(tId).tsMessageSelect .= MessageSelectState (pure $ MessagePostId latestPId) + _ -> return () + else do + -- add a gap at the end of the newly fetched block and + -- make that the active selection if this fetch removed + -- the previously selected gap in this direction. + gapMsg <- newGapMessage (justAfter latestDate) False + csChannels %= modifyChannelById cId + (ccContents.cdMessages %~ addMessage gapMsg) + -- Move selection from old gap to new gap + case rmvdSelType of + Just (C UnknownGapAfter) -> + csTeam(tId).tsMessageSelect .= MessageSelectState (gapMsg^.mMessageId) + _ -> return () - if reAddGapAfter - then - -- No more gaps. If the selected gap was removed, move - -- select to last (latest) message. - case rmvdSelType of - Just (C UnknownGapAfter) -> - csMessageSelect .= MessageSelectState (pure $ MessagePostId latestPId) - _ -> return () - else do - -- add a gap at the end of the newly fetched block and - -- make that the active selection if this fetch removed - -- the previously selected gap in this direction. - gapMsg <- newGapMessage (justAfter latestDate) False - csChannels %= modifyChannelById cId - (ccContents.cdMessages %~ addMessage gapMsg) - -- Move selection from old gap to new gap - case rmvdSelType of - Just (C UnknownGapAfter) -> - csMessageSelect .= MessageSelectState (gapMsg^.mMessageId) - _ -> return () + case mTId of + Nothing -> do + ts <- use csTeams + forM_ (HM.keys ts) processTeam + Just tId -> processTeam tId -- Now initiate fetches for use information for any -- as-yet-unknown users related to this new set of messages @@ -498,9 +510,13 @@ postProcessMessageAdd return NoAction - Just _ -> do - baseUrl <- getServerBaseUrl - let cp = toClientPost baseUrl new (new^.postRootIdL) + Just ch -> do + let mTId = ch^.ccInfo.cdTeamId + mBaseUrl <- case mTId of + Nothing -> return Nothing + Just tId -> Just <$> getServerBaseUrl tId + + let cp = toClientPost mBaseUrl new (new^.postRootIdL) fromMe = (cp^.cpUser == (Just $ myUserId st)) && (isNothing $ cp^.cpUserOverride) userPrefs = st^.csResources.crUserPreferences @@ -521,7 +537,8 @@ when (isNothing authorResult) $ handleNewUsers (Seq.singleton authorId) (return ()) - currCId <- use csCurrentChannelId + curTId <- use csCurrentTeamId + currCId <- use (csCurrentChannelId curTId) flags <- use (csResources.crFlaggedPosts) let (msg', mentionedUsers) = clientPostToMessage cp & _1.mFlagged .~ ((cp^.cpPostId) `Set.member` flags) @@ -560,7 +577,7 @@ Nothing -> do doAsyncChannelMM Preempt cId (\s _ -> MM.mmGetThread parentId s) - (\_ p -> Just $ updatePostMap p) + (\_ p -> Just $ updatePostMap mTId p) _ -> return () _ -> return () @@ -568,7 +585,8 @@ postedChanMessage = withChannelOrDefault (postChannelId new) NoAction $ \chan -> do - currCId <- use csCurrentChannelId + currTid <- use csCurrentTeamId + currCId <- use (csCurrentChannelId currTid) let notifyPref = notifyPreference (myUser st) chan curChannelAction = if postChannelId new == currCId @@ -627,7 +645,7 @@ maybeRingBell :: MH () maybeRingBell = do - doBell <- use (csResources.crConfiguration.to configActivityBell) + doBell <- use (csResources.crConfiguration.configActivityBellL) when doBell $ do vty <- mh getVtyHandle liftIO $ ringTerminalBell $ outputIface vty @@ -651,7 +669,7 @@ runNotifyCommand post mentioned = do outputChan <- use (csResources.crSubprocessLog) st <- use id - notifyCommand <- use (csResources.crConfiguration.to configActivityNotifyCommand) + notifyCommand <- use (csResources.crConfiguration.configActivityNotifyCommandL) case notifyCommand of Nothing -> return () Just cmd -> @@ -704,7 +722,8 @@ -- channels and empty channels. asyncFetchMoreMessages :: MH () asyncFetchMoreMessages = do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) withChannel cId $ \chan -> let offset = max 0 $ length (chan^.ccContents.cdMessages) - 2 page = offset `div` pageAmount @@ -829,7 +848,8 @@ fetchVisibleIfNeeded = do sts <- use csConnectionStatus when (sts == Connected) $ do - cId <- use csCurrentChannelId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) withChannel cId $ \chan -> let msgs = chan^.ccContents.cdMessages.to reverseMessages (numRemaining, gapInDisplayable, _, rel'pId, overlap) = @@ -904,7 +924,7 @@ Just _ -> do setFocus cId setMode MessageSelect - csMessageSelect .= MessageSelectState (msg^.mMessageId) + csCurrentTeam.tsMessageSelect .= MessageSelectState (msg^.mMessageId) Nothing -> error "INTERNAL: selected Post ID not associated with a channel" Nothing -> do diff --git a/src/Matterhorn/State/NotifyPrefs.hs b/src/Matterhorn/State/NotifyPrefs.hs --- a/src/Matterhorn/State/NotifyPrefs.hs +++ b/src/Matterhorn/State/NotifyPrefs.hs @@ -10,6 +10,7 @@ import Matterhorn.Prelude import Network.Mattermost.Types ( ChannelNotifyProps + , TeamId , User(..) , UserNotifyProps(..) , Type(..) @@ -61,14 +62,14 @@ ] in radioField l (defaultField : nonDefault) -notifyPrefsForm :: UserNotifyProps -> ChannelNotifyProps -> Form ChannelNotifyProps e Name -notifyPrefsForm globalDefaults = - newForm [ checkboxField muteLens MuteToggleField "Mute channel" - , (padTop $ Pad 1) @@= checkboxField channelMentionLens ChannelMentionsField "Ignore channel mentions" +notifyPrefsForm :: TeamId -> UserNotifyProps -> ChannelNotifyProps -> Form ChannelNotifyProps e Name +notifyPrefsForm tId globalDefaults = + newForm [ checkboxField muteLens (MuteToggleField tId) "Mute channel" + , (padTop $ Pad 1) @@= checkboxField channelMentionLens (ChannelMentionsField tId) "Ignore channel mentions" , radioStyle "Desktop notifications" @@= - mkNotifyButtons DesktopNotificationsField channelNotifyPropsDesktopL (userNotifyPropsDesktop globalDefaults) + mkNotifyButtons (DesktopNotificationsField tId) channelNotifyPropsDesktopL (userNotifyPropsDesktop globalDefaults) , radioStyle "Push notifications" @@= - mkNotifyButtons PushNotificationsField channelNotifyPropsPushL (userNotifyPropsPush globalDefaults) + mkNotifyButtons (PushNotificationsField tId) channelNotifyPropsPushL (userNotifyPropsPush globalDefaults) ] where radioStyle label = (padTop $ Pad 1 ) . (str label <=>) . (padLeft $ Pad 1) @@ -80,7 +81,8 @@ _ -> do let props = chanInfo^.cdNotifyProps user <- use csMe - csNotifyPrefs .= (Just (notifyPrefsForm (userNotifyProps user) props)) + tId <- use csCurrentTeamId + csCurrentTeam.tsNotifyPrefs .= (Just (notifyPrefsForm tId (userNotifyProps user) props)) setMode EditNotifyPrefs exitEditNotifyPrefsMode :: MH () diff --git a/src/Matterhorn/State/PostListOverlay.hs b/src/Matterhorn/State/PostListOverlay.hs --- a/src/Matterhorn/State/PostListOverlay.hs +++ b/src/Matterhorn/State/PostListOverlay.hs @@ -33,11 +33,11 @@ -- with a specified list of messages. enterPostListMode :: PostListContents -> Messages -> MH () enterPostListMode contents msgs = do - csPostListOverlay.postListPosts .= msgs + csCurrentTeam.tsPostListOverlay.postListPosts .= msgs let mlatest = getLatestPostMsg msgs pId = mlatest >>= messagePostId cId = mlatest >>= \m -> m^.mChannelId - csPostListOverlay.postListSelected .= pId + csCurrentTeam.tsPostListOverlay.postListSelected .= pId setMode $ PostListOverlay contents case (pId, cId) of (Just p, Just c) -> asyncFetchMessagesSurrounding c p @@ -46,18 +46,18 @@ -- | Clear out the state of a PostListOverlay exitPostListMode :: MH () exitPostListMode = do - csPostListOverlay.postListPosts .= emptyDirSeq - csPostListOverlay.postListSelected .= Nothing + csCurrentTeam.tsPostListOverlay.postListPosts .= emptyDirSeq + csCurrentTeam.tsPostListOverlay.postListSelected .= Nothing setMode Main -createPostList :: PostListContents -> (Session -> IO Posts) -> MH () -createPostList contentsType fetchOp = do +createPostList :: TeamId -> PostListContents -> (Session -> IO Posts) -> MH () +createPostList tId contentsType fetchOp = do session <- getSession doAsyncWith Preempt $ do posts <- fetchOp session return $ Just $ do - messages <- installMessagesFromPosts posts + messages <- installMessagesFromPosts (Just tId) posts -- n.b. do not use addNewPostedMessage because these messages -- are not new, and so no notifications or channel highlighting -- or other post-processing should be performed. @@ -71,15 +71,18 @@ -- | Create a PostListOverlay with flagged messages from the server. enterFlaggedPostListMode :: MH () -enterFlaggedPostListMode = createPostList PostListFlagged $ - mmGetListOfFlaggedPosts UserMe defaultFlaggedPostsQuery +enterFlaggedPostListMode = do + tId <- use csCurrentTeamId + createPostList tId PostListFlagged $ + mmGetListOfFlaggedPosts UserMe defaultFlaggedPostsQuery -- | Create a PostListOverlay with pinned messages from the server for -- the current channel. enterPinnedPostListMode :: MH () enterPinnedPostListMode = do - cId <- use csCurrentChannelId - createPostList (PostListPinned cId) $ mmGetChannelPinnedPosts cId + tId <- use csCurrentTeamId + cId <- use (csCurrentChannelId tId) + createPostList tId (PostListPinned cId) $ mmGetChannelPinnedPosts cId -- | Create a PostListOverlay with post search result messages from the -- server. @@ -88,8 +91,8 @@ | T.null (T.strip terms) = postInfoMessage "Search command requires at least one search term." | otherwise = do enterPostListMode (PostListSearch terms True) noMessages - tId <- gets myTeamId - createPostList (PostListSearch terms False) $ + tId <- use csCurrentTeamId + createPostList tId (PostListSearch terms False) $ mmSearchForTeamPosts tId (SearchPosts terms False) @@ -97,14 +100,14 @@ -- to finding a chronologically /newer/ message. postListSelectUp :: MH () postListSelectUp = do - selId <- use (csPostListOverlay.postListSelected) - posts <- use (csPostListOverlay.postListPosts) + selId <- use (csCurrentTeam.tsPostListOverlay.postListSelected) + posts <- use (csCurrentTeam.tsPostListOverlay.postListPosts) let nextMsg = getNextMessage (MessagePostId <$> selId) posts case nextMsg of Nothing -> return () Just m -> do let pId = m^.mMessageId >>= messageIdPostId - csPostListOverlay.postListSelected .= pId + csCurrentTeam.tsPostListOverlay.postListSelected .= pId case (m^.mChannelId, pId) of (Just c, Just p) -> asyncFetchMessagesSurrounding c p o -> mhLog LogError @@ -115,14 +118,14 @@ -- to finding a chronologically /old/ message. postListSelectDown :: MH () postListSelectDown = do - selId <- use (csPostListOverlay.postListSelected) - posts <- use (csPostListOverlay.postListPosts) + selId <- use (csCurrentTeam.tsPostListOverlay.postListSelected) + posts <- use (csCurrentTeam.tsPostListOverlay.postListPosts) let prevMsg = getPrevMessage (MessagePostId <$> selId) posts case prevMsg of Nothing -> return () Just m -> do let pId = m^.mMessageId >>= messageIdPostId - csPostListOverlay.postListSelected .= pId + csCurrentTeam.tsPostListOverlay.postListSelected .= pId case (m^.mChannelId, pId) of (Just c, Just p) -> asyncFetchMessagesSurrounding c p o -> mhLog LogError @@ -132,7 +135,7 @@ -- | Unflag the post currently selected in the PostListOverlay, if any postListUnflagSelected :: MH () postListUnflagSelected = do - msgId <- use (csPostListOverlay.postListSelected) + msgId <- use (csCurrentTeam.tsPostListOverlay.postListSelected) case msgId of Nothing -> return () Just pId -> flagMessage pId False @@ -142,7 +145,7 @@ -- display and changes to MessageSelectState. postListJumpToCurrent :: MH () postListJumpToCurrent = do - msgId <- use (csPostListOverlay.postListSelected) + msgId <- use (csCurrentTeam.tsPostListOverlay.postListSelected) case msgId of Nothing -> return () Just pId -> jumpToPost pId diff --git a/src/Matterhorn/State/ReactionEmojiListOverlay.hs b/src/Matterhorn/State/ReactionEmojiListOverlay.hs --- a/src/Matterhorn/State/ReactionEmojiListOverlay.hs +++ b/src/Matterhorn/State/ReactionEmojiListOverlay.hs @@ -37,9 +37,10 @@ case selectedMessage of Nothing -> return () Just msg -> do + tId <- use csCurrentTeamId em <- use (csResources.crEmoji) myId <- gets myUserId - enterListOverlayMode csReactionEmojiListOverlay ReactionEmojiListOverlay + enterListOverlayMode (csTeam(tId).tsReactionEmojiListOverlay) ReactionEmojiListOverlay () enterHandler (fetchResults myId msg em) enterHandler :: (Bool, T.Text) -> MH Bool @@ -118,7 +119,7 @@ -- cursor, and then check to see whether the modification warrants a -- prefetch of more search results. reactionEmojiListMove :: (L.List Name (Bool, T.Text) -> L.List Name (Bool, T.Text)) -> MH () -reactionEmojiListMove = listOverlayMove csReactionEmojiListOverlay +reactionEmojiListMove = listOverlayMove (csCurrentTeam.tsReactionEmojiListOverlay) -- | The number of emoji in a "page" for cursor movement purposes. reactionEmojiListPageSize :: Int diff --git a/src/Matterhorn/State/Setup.hs b/src/Matterhorn/State/Setup.hs --- a/src/Matterhorn/State/Setup.hs +++ b/src/Matterhorn/State/Setup.hs @@ -10,8 +10,9 @@ import Brick.BChan ( newBChan ) import Brick.Themes ( themeToAttrMap, loadCustomizations ) import qualified Control.Concurrent.STM as STM +import qualified Data.Foldable as F +import qualified Data.HashMap.Strict as HM import Data.Maybe ( fromJust ) -import qualified Data.Sequence as Seq import qualified Data.Text as T import Data.Time.Clock ( getCurrentTime ) import qualified Graphics.Vty as Vty @@ -24,19 +25,16 @@ import Matterhorn.Config import Matterhorn.InputHistory -import Matterhorn.LastRunState import Matterhorn.Login import Matterhorn.State.Flagging -import Matterhorn.State.Messages ( fetchVisibleIfNeeded ) +import Matterhorn.State.Teams ( buildTeamState ) import Matterhorn.State.Setup.Threads -import Matterhorn.TeamSelect import Matterhorn.Themes import Matterhorn.TimeUtils ( lookupLocalTimeZone ) import Matterhorn.Types import Matterhorn.Types.Common import Matterhorn.Emoji import Matterhorn.FilePaths ( userEmojiJsonPath, bundledEmojiJsonPath ) -import qualified Matterhorn.Zipper as Z incompleteCredentials :: Config -> ConnectionInfo @@ -103,25 +101,15 @@ -- with setup. return (sess, user, cd, mbTeam) - teams <- mmGetUsersTeams UserMe session - when (Seq.null teams) $ do + teams <- F.toList <$> mmGetUsersTeams UserMe session + when (null teams) $ do putStrLn "Error: your account is not a member of any teams" exitFailure - (myTeam, teamSelVty) <- do - let foundTeam = do - tName <- mbTeam <|> configTeam config - let matchingTeam = listToMaybe $ filter matches $ toList teams - matches t = (sanitizeUserText $ teamName t) == tName - matchingTeam - - case foundTeam of - Just t -> return (t, loginVty) - Nothing -> do - (mTeam, vty) <- interactiveTeamSelection loginVty mkVty $ toList teams - case mTeam of - Nothing -> shutdown vty - Just team -> return (team, vty) + let initialTeamId = fromMaybe (teamId $ head $ sortTeams teams) $ do + tName <- mbTeam <|> configTeam config + let matchingTeam = listToMaybe $ filter (matchesTeam tName) teams + teamId <$> matchingTeam userStatusChan <- STM.newTChanIO slc <- STM.newTChanIO @@ -151,7 +139,7 @@ result <- loadCustomizations absPath baseTheme case result of Left e -> do - Vty.shutdown teamSelVty + Vty.shutdown loginVty putStrLn $ "Error loading theme customization from " <> show absPath <> ": " <> e exitFailure Right t -> return t @@ -181,43 +169,23 @@ , _crEmoji = emoji } - st <- initializeState cr myTeam me + st <- initializeState cr initialTeamId teams me - return (st, teamSelVty) + return (st, loginVty) -initializeState :: ChatResources -> Team -> User -> IO ChatState -initializeState cr myTeam me = do +matchesTeam :: T.Text -> Team -> Bool +matchesTeam tName t = + let normalizeUserText = normalize . sanitizeUserText + normalize = T.strip . T.toLower + urlName = normalizeUserText $ teamName t + displayName = normalizeUserText $ teamDisplayName t + in normalize tName `elem` [displayName, urlName] + +initializeState :: ChatResources -> TeamId -> [Team] -> User -> IO ChatState +initializeState cr initialTeamId teams me = do let session = getResourceSession cr requestChan = cr^.crRequestQueue - myTId = getId myTeam - -- Create a predicate to find the last selected channel by reading the - -- run state file. If unable to read or decode or validate the file, this - -- predicate is just `isTownSquare`. - isLastSelectedChannel <- do - result <- readLastRunState $ teamId myTeam - case result of - Right lrs | isValidLastRunState cr me lrs -> return $ \c -> - channelId c == lrs^.lrsSelectedChannelId - _ -> return isTownSquare - - -- Get all channels, but filter down to just the one we want to start - -- in. We get all, rather than requesting by name or ID, because - -- we don't know whether the server will give us a last-viewed preference. - -- We first try to find a channel matching with the last selected channel ID, - -- failing which we look for the Town Square channel by name. - userChans <- mmGetChannelsForUser UserMe myTId session - let lastSelectedChans = Seq.filter isLastSelectedChannel userChans - chans = if Seq.null lastSelectedChans - then Seq.filter isTownSquare userChans - else lastSelectedChans - - -- Since the only channel we are dealing with is by construction the - -- last channel, we don't have to consider other cases here: - chanPairs <- forM (toList chans) $ \c -> do - cChannel <- makeClientChannel (userId me) c - return (getId c, cChannel) - tz <- lookupLocalTimeZone hist <- do result <- readHistory @@ -247,35 +215,26 @@ -- * Subprocess logger startSubprocessLoggerThread (cr^.crSubprocessLog) requestChan - -- * Spell checker and spell check timer, if configured - spResult <- maybeStartSpellChecker (cr^.crConfiguration) (cr^.crEventQueue) - -- End thread startup ---------------------------------------------- - now <- getCurrentTime - let chanIds = mkChannelZipperList now (cr^.crConfiguration) Nothing (cr^.crUserPreferences) clientChans noUsers - chanZip = Z.fromList chanIds - clientChans = foldr (uncurry addChannel) noChannels chanPairs - startupState = + -- For each team, build a team state and load the last-run state. + (teamStates, chanLists) <- unzip <$> mapM (buildTeamState cr me) teams + + let startupState = StartupStateInfo { startupStateResources = cr - , startupStateChannelZipper = chanZip , startupStateConnectedUser = me - , startupStateTeam = myTeam , startupStateTimeZone = tz , startupStateInitialHistory = hist - , startupStateSpellChecker = spResult + , startupStateInitialTeam = initialTeamId + , startupStateTeams = teamMap } - - initialState <- newState startupState - let st = initialState & csChannels .~ clientChans + clientChans = mconcat chanLists + st = newState startupState & csChannels .~ clientChans + teamMap = HM.fromList $ (\ts -> (teamId $ _tsTeam ts, ts)) <$> F.toList teamStates loadFlaggedMessages (cr^.crUserPreferences.userPrefFlaggedPostList) st -- Trigger an initial websocket refresh writeBChan (cr^.crEventQueue) RefreshWebsocketEvent - - -- Refresh initial channel(s) - writeBChan (cr^.crEventQueue) $ RespEvent $ do - fetchVisibleIfNeeded return st diff --git a/src/Matterhorn/State/Teams.hs b/src/Matterhorn/State/Teams.hs new file mode 100644 --- /dev/null +++ b/src/Matterhorn/State/Teams.hs @@ -0,0 +1,217 @@ +module Matterhorn.State.Teams + ( nextTeam + , prevTeam + , handleJoinTeam + , handleLeaveTeam + , handleUpdateTeam + , buildTeamState + , moveCurrentTeamLeft + , moveCurrentTeamRight + ) +where + +import Prelude () +import Matterhorn.Prelude + +import Brick.Main ( invalidateCache ) +import qualified Data.Sequence as Seq +import qualified Data.Text as T +import Data.Time.Clock ( getCurrentTime ) +import qualified Data.HashMap.Strict as HM +import Lens.Micro.Platform ( (%=), (.=), at ) + +import Network.Mattermost.Lenses ( userIdL ) +import Network.Mattermost.Types ( TeamId, Team, User, userId + , getId, channelId, teamId, UserParam(..) + , teamOrderPref + ) +import qualified Network.Mattermost.Endpoints as MM + +import Matterhorn.Types +import Matterhorn.LastRunState +import Matterhorn.State.Async +import Matterhorn.State.ChannelList +import Matterhorn.State.Channels +import Matterhorn.State.Messages +import Matterhorn.State.Setup.Threads ( maybeStartSpellChecker ) +import qualified Matterhorn.Zipper as Z + + +-- | Move right in the channel list to select the next team. +nextTeam :: MH () +nextTeam = setTeamFocusWith Z.right + +-- | Move left in the channel list to select the previous team. +prevTeam :: MH () +prevTeam = setTeamFocusWith Z.left + +-- | Change the selected team with the specified team zipper +-- transformation. This function also takes care of book-keeping +-- necessary during team switching. +setTeamFocusWith :: (Z.Zipper () TeamId -> Z.Zipper () TeamId) -> MH () +setTeamFocusWith f = do + csTeamZipper %= f + postChangeTeamCommon + +-- | Book-keeping common to all team selection changes. +postChangeTeamCommon :: MH () +postChangeTeamCommon = do + updateViewed False + fetchVisibleIfNeeded + +-- | Fetch the specified team and add it to the application state. +-- +-- This is called in response to a server event indicating that the +-- current user was added to the team. +handleJoinTeam :: TeamId -> MH () +handleJoinTeam tId = do + session <- getSession + cr <- use csResources + me <- use csMe + + mhLog LogGeneral $ T.pack $ "Joining team " <> show tId + doAsyncWith Normal $ do + t <- MM.mmGetTeam tId session + (ts, chans) <- buildTeamState cr me t + return $ Just $ do + curTs <- use csTeams + let myTIds = HM.keys curTs + when (not $ tId `elem` myTIds) $ do + addTeamState ts chans + updateSidebar $ Just tId + updateWindowTitle + refreshTeamZipper + +-- | Remove the specified team to the application state. +-- +-- This is called in response to a server event indicating that the +-- current user was removed from the team. +handleLeaveTeam :: TeamId -> MH () +handleLeaveTeam tId = + doAsyncWith Normal $ return $ Just $ do + mhLog LogGeneral $ T.pack $ "Leaving team " <> show tId + removeTeam tId + updateWindowTitle + -- Invalidating the cache here expunges any cached message + -- renderings from the team we are leaving. + mh invalidateCache + +-- | Fetch the specified team's metadata and update it in the +-- application state. +-- +-- This is called in response to a server event indicating that the +-- specified team was updated in some way. +handleUpdateTeam :: TeamId -> MH () +handleUpdateTeam tId = do + session <- getSession + mhLog LogGeneral $ T.pack $ "Updating team " <> show tId + doAsyncWith Normal $ do + t <- MM.mmGetTeam tId session + return $ Just $ do + updateTeam t + -- Invalidate the cache since we happen to know that the + -- team name is in the cached sidebar. + mh invalidateCache + +-- | Set the team zipper ordering with the specified transformation, +-- which is expected to be either 'moveLeft' or 'moveRight'. +setTeamOrderWith :: (TeamId -> [TeamId] -> [TeamId]) -> MH () +setTeamOrderWith sortFunc = do + session <- getSession + me <- use csMe + + tId <- use csCurrentTeamId + z <- use csTeamZipper + let tIds = teamZipperIds z + newList = sortFunc tId tIds + + doAsyncWith Normal $ do + let pref = teamOrderPref (me^.userIdL) newList + MM.mmSaveUsersPreferences UserMe (Seq.singleton pref) session + return Nothing + +-- | Move the selected team left in the team list. +moveCurrentTeamLeft :: MH () +moveCurrentTeamLeft = setTeamOrderWith moveLeft + +-- | Move the selected team right in the team list. +moveCurrentTeamRight :: MH () +moveCurrentTeamRight = setTeamOrderWith moveRight + +-- | Build a new 'TeamState' for the specified team. +-- +-- This function starts a new spell checker thread for the team's +-- message editor, loads the last-run state for the team (to ensure that +-- the initially-selected channel is honored), and fetches the channel +-- metadata for the team. +-- +-- This returns the resulting team state as well as the channels +-- associated with the team. The caller is responsible for adding the +-- channels and the team state to the application state. +buildTeamState :: ChatResources -> User -> Team -> IO (TeamState, ClientChannels) +buildTeamState cr me team = do + let tId = teamId team + session = getResourceSession cr + + -- Create a predicate to find the last selected channel by reading + -- the run state file. If unable to read or decode or validate the + -- file, this predicate is just `isTownSquare`. + isLastSelectedChannel <- do + result <- readLastRunState tId + case result of + Right lrs | isValidLastRunState cr me lrs -> return $ \c -> + channelId c == lrs^.lrsSelectedChannelId + _ -> return isTownSquare + + -- Get all channels, but filter down to just the one we want + -- to start in. We get all, rather than requesting by name or + -- ID, because we don't know whether the server will give us a + -- last-viewed preference. We first try to find a channel matching + -- with the last selected channel ID, failing which we look for the + -- Town Square channel by name. + userChans <- MM.mmGetChannelsForUser UserMe tId session + let lastSelectedChans = Seq.filter isLastSelectedChannel userChans + chans = if Seq.null lastSelectedChans + then Seq.filter isTownSquare userChans + else lastSelectedChans + + -- Since the only channel we are dealing with is by construction the + -- last channel, we don't have to consider other cases here: + chanPairs <- forM (toList chans) $ \c -> do + cChannel <- makeClientChannel (userId me) c + return (getId c, cChannel) + + -- Start the spell checker and spell check timer, if configured + spResult <- maybeStartSpellChecker (cr^.crConfiguration) (cr^.crEventQueue) + + now <- getCurrentTime + let chanIds = mkChannelZipperList now (cr^.crConfiguration) tId + Nothing (cr^.crUserPreferences) + clientChans noUsers + chanZip = Z.fromList chanIds + clientChans = foldr (uncurry addChannel) noChannels chanPairs + + return (newTeamState team chanZip spResult, clientChans) + +-- | Add a new 'TeamState' and corresponding channels to the application +-- state. +addTeamState :: TeamState -> ClientChannels -> MH () +addTeamState ts chans = do + let tId = teamId $ _tsTeam ts + csTeams.at tId .= Just ts + csChannels %= (chans <>) + +-- | Update the specified team metadata in the application state (only +-- if we are already a member of that team). +updateTeam :: Team -> MH () +updateTeam t = do + let tId = teamId t + ts <- use csTeams + when (tId `elem` HM.keys ts) $ do + csTeam(tId).tsTeam .= t + +-- | Remove the specified team from the application state. +removeTeam :: TeamId -> MH () +removeTeam tId = do + csTeams.at tId .= Nothing + setTeamFocusWith $ Z.filterZipper (/= tId) diff --git a/src/Matterhorn/State/ThemeListOverlay.hs b/src/Matterhorn/State/ThemeListOverlay.hs --- a/src/Matterhorn/State/ThemeListOverlay.hs +++ b/src/Matterhorn/State/ThemeListOverlay.hs @@ -31,7 +31,8 @@ -- request to gather the first search results. enterThemeListMode :: MH () enterThemeListMode = - enterListOverlayMode csThemeListOverlay ThemeListOverlay () setInternalTheme getThemesMatching + enterListOverlayMode (csCurrentTeam.tsThemeListOverlay) + ThemeListOverlay () setInternalTheme getThemesMatching -- | Move the selection up in the user list overlay by one user. themeListSelectUp :: MH () @@ -55,7 +56,7 @@ -- cursor, and then check to see whether the modification warrants a -- prefetch of more search results. themeListMove :: (L.List Name InternalTheme -> L.List Name InternalTheme) -> MH () -themeListMove = listOverlayMove csThemeListOverlay +themeListMove = listOverlayMove (csCurrentTeam.tsThemeListOverlay) -- | The number of users in a "page" for cursor movement purposes. themeListPageSize :: Int diff --git a/src/Matterhorn/State/UrlSelect.hs b/src/Matterhorn/State/UrlSelect.hs --- a/src/Matterhorn/State/UrlSelect.hs +++ b/src/Matterhorn/State/UrlSelect.hs @@ -22,15 +22,16 @@ startUrlSelect :: MH () startUrlSelect = do urls <- use (csCurrentChannel.to findUrls.to V.fromList) + tId <- use csCurrentTeamId setMode UrlSelect - csUrlList .= (listMoveTo (length urls - 1) $ list UrlList urls 2) + csCurrentTeam.tsUrlList .= (listMoveTo (length urls - 1) $ list (UrlList tId) urls 2) stopUrlSelect :: MH () stopUrlSelect = setMode Main openSelectedURL :: MH () openSelectedURL = whenMode UrlSelect $ do - selected <- use (csUrlList.to listSelectedElement) + selected <- use (csCurrentTeam.tsUrlList.to listSelectedElement) case selected of Nothing -> setMode Main Just (_, link) -> do diff --git a/src/Matterhorn/State/UserListOverlay.hs b/src/Matterhorn/State/UserListOverlay.hs --- a/src/Matterhorn/State/UserListOverlay.hs +++ b/src/Matterhorn/State/UserListOverlay.hs @@ -34,15 +34,15 @@ -- current channel. enterChannelMembersUserList :: MH () enterChannelMembersUserList = do - cId <- use csCurrentChannelId + myTId <- use csCurrentTeamId + cId <- use (csCurrentChannelId myTId) myId <- gets myUserId - myTId <- gets myTeamId session <- getSession doAsyncWith Preempt $ do stats <- MM.mmGetChannelStatistics cId session return $ Just $ do - enterUserListMode (ChannelMembers cId myTId) (Just $ channelStatsMemberCount stats) + enterUserListMode myTId (ChannelMembers cId myTId) (Just $ channelStatsMemberCount stats) (\u -> case u^.uiId /= myId of True -> createOrFocusDMChannel u Nothing >> return True False -> return False @@ -53,10 +53,10 @@ -- channel. enterChannelInviteUserList :: MH () enterChannelInviteUserList = do - cId <- use csCurrentChannelId + myTId <- use csCurrentTeamId + cId <- use (csCurrentChannelId myTId) myId <- gets myUserId - myTId <- gets myTeamId - enterUserListMode (ChannelNonMembers cId myTId) Nothing + enterUserListMode myTId (ChannelNonMembers cId myTId) Nothing (\u -> case u^.uiId /= myId of True -> addUserToCurrentChannel u >> return True False -> return False @@ -67,12 +67,12 @@ enterDMSearchUserList :: MH () enterDMSearchUserList = do myId <- gets myUserId - myTId <- gets myTeamId + myTId <- use csCurrentTeamId config <- use csClientConfig let restrictTeam = case MM.clientConfigRestrictDirectMessage <$> config of Just MM.RestrictTeam -> Just myTId _ -> Nothing - enterUserListMode (AllUsers restrictTeam) Nothing + enterUserListMode myTId (AllUsers restrictTeam) Nothing (\u -> case u^.uiId /= myId of True -> createOrFocusDMChannel u Nothing >> return True False -> return False @@ -80,10 +80,10 @@ -- | Show the user list overlay with the given search scope, and issue a -- request to gather the first search results. -enterUserListMode :: UserSearchScope -> Maybe Int -> (UserInfo -> MH Bool) -> MH () -enterUserListMode scope resultCount enterHandler = do - csUserListOverlay.listOverlayRecordCount .= resultCount - enterListOverlayMode csUserListOverlay UserListOverlay scope enterHandler getUserSearchResults +enterUserListMode :: TeamId -> UserSearchScope -> Maybe Int -> (UserInfo -> MH Bool) -> MH () +enterUserListMode tId scope resultCount enterHandler = do + csTeam(tId).tsUserListOverlay.listOverlayRecordCount .= resultCount + enterListOverlayMode (csTeam(tId).tsUserListOverlay) UserListOverlay scope enterHandler getUserSearchResults userInfoFromPair :: User -> Text -> UserInfo userInfoFromPair u status = @@ -111,7 +111,7 @@ -- cursor, and then check to see whether the modification warrants a -- prefetch of more search results. userListMove :: (L.List Name UserInfo -> L.List Name UserInfo) -> MH () -userListMove = listOverlayMove csUserListOverlay +userListMove = listOverlayMove (csCurrentTeam.tsUserListOverlay) -- | The number of users in a "page" for cursor movement purposes. userListPageSize :: Int diff --git a/src/Matterhorn/TeamSelect.hs b/src/Matterhorn/TeamSelect.hs deleted file mode 100644 --- a/src/Matterhorn/TeamSelect.hs +++ /dev/null @@ -1,90 +0,0 @@ -module Matterhorn.TeamSelect - ( interactiveTeamSelection - ) -where - -import Prelude () -import Matterhorn.Prelude - -import Brick -import Brick.Widgets.Border -import Brick.Widgets.Center -import Brick.Widgets.List -import qualified Data.Function as F -import Data.List ( sortBy ) -import qualified Data.Vector as V -import Graphics.Vty hiding (mkVty) -import qualified Data.Text as T - -import Network.Mattermost.Types - -import Matterhorn.Draw.RichText -import Matterhorn.Types.Common - - -data State = - State { appList :: List () Team - , appCancelled :: Bool - } - -interactiveTeamSelection :: Vty -> IO Vty -> [Team] -> IO (Maybe Team, Vty) -interactiveTeamSelection vty mkVty teams = do - let state = State { appList = list () (V.fromList sortedTeams) 1 - , appCancelled = False - } - sortedTeams = sortBy (compare `F.on` teamName) teams - - (finalSt, finalVty) <- customMainWithVty vty mkVty Nothing app state - - let result = if appCancelled finalSt - then Nothing - else snd <$> listSelectedElement (appList finalSt) - - return (result, finalVty) - -app :: App State e () -app = App - { appDraw = teamSelectDraw - , appChooseCursor = neverShowCursor - , appHandleEvent = onEvent - , appStartEvent = return - , appAttrMap = const colorTheme - } - -colorTheme :: AttrMap -colorTheme = attrMap defAttr - [ (listSelectedFocusedAttr, black `on` yellow) - ] - -teamSelectDraw :: State -> [Widget ()] -teamSelectDraw st = - [ teamSelect st - ] - -teamSelect :: State -> Widget () -teamSelect st = - center $ hLimit 50 $ vLimit 15 $ - vBox [ hCenter $ txt "Welcome to Mattermost. Please select a team:" - , txt " " - , border theList - , txt " " - , renderText "Press Enter to select a team and connect or Esc to exit." - ] - where - theList = renderList renderTeamItem True (appList st) - -renderTeamItem :: Bool -> Team -> Widget () -renderTeamItem _ t = - padRight Max $ txt $ (sanitizeUserText $ teamName t) <> - if not $ T.null (sanitizeUserText $ teamDisplayName t) - then " (" <> (sanitizeUserText $ teamDisplayName t) <> ")" - else "" - -onEvent :: State -> BrickEvent () e -> EventM () (Next State) -onEvent st (VtyEvent (EvKey KEsc [])) = do - halt $ st { appCancelled = True } -onEvent st (VtyEvent (EvKey KEnter [])) = halt st -onEvent st (VtyEvent e) = do - list' <- handleListEvent e (appList st) - continue $ st { appList = list' } -onEvent st _ = continue st diff --git a/src/Matterhorn/Themes.hs b/src/Matterhorn/Themes.hs --- a/src/Matterhorn/Themes.hs +++ b/src/Matterhorn/Themes.hs @@ -16,6 +16,7 @@ , unreadChannelAttr , unreadGroupMarkerAttr , mentionsChannelAttr + , currentTeamAttr , urlAttr , codeAttr , emailAttr @@ -161,6 +162,9 @@ mentionsChannelAttr :: AttrName mentionsChannelAttr = "channelWithMentions" +currentTeamAttr :: AttrName +currentTeamAttr = "currentTeam" + tabSelectedAttr :: AttrName tabSelectedAttr = "tabSelected" @@ -309,6 +313,7 @@ , (editedRecentlyMarkingAttr, black `on` yellow) , (tabSelectedAttr, black `on` yellow) , (focusedFormInputAttr, black `on` yellow) + , (currentTeamAttr, black `on` yellow) , (FB.fileBrowserCurrentDirectoryAttr, white `on` blue) , (FB.fileBrowserSelectionInfoAttr, white `on` blue) , (FB.fileBrowserDirectoryAttr, fg blue) @@ -369,6 +374,7 @@ , (editedRecentlyMarkingAttr, black `on` yellow) , (tabSelectedAttr, black `on` yellow) , (focusedFormInputAttr, black `on` yellow) + , (currentTeamAttr, black `on` yellow) , (FB.fileBrowserCurrentDirectoryAttr, white `on` blue) , (FB.fileBrowserSelectionInfoAttr, white `on` blue) , (FB.fileBrowserDirectoryAttr, fg blue) @@ -802,6 +808,9 @@ ) , ( currentUserAttr , "Attribute for the username of the user running Matterhorn" + ) + , ( currentTeamAttr + , "The currently-selected team" ) ] <> [ (usernameAttr i, T.pack $ "Username color " <> show i) | i <- [0..usernameColorHashBuckets-1] diff --git a/src/Matterhorn/Types.hs b/src/Matterhorn/Types.hs --- a/src/Matterhorn/Types.hs +++ b/src/Matterhorn/Types.hs @@ -51,7 +51,47 @@ , ChannelTopicDialogState(..) , channelTopicDialogEditor , channelTopicDialogFocus + , Config(..) + , configUserL + , configHostL + , configTeamL + , configPortL + , configUrlPathL + , configPassL + , configTokenL + , configTimeFormatL + , configDateFormatL + , configThemeL + , configThemeCustomizationFileL + , configSmartBacktickL + , configSmartEditingL + , configURLOpenCommandL + , configURLOpenCommandInteractiveL + , configActivityNotifyCommandL + , configActivityBellL + , configShowMessageTimestampsL + , configShowBackgroundL + , configShowMessagePreviewL + , configShowChannelListL + , configShowExpandedChannelTopicsL + , configEnableAspellL + , configAspellDictionaryL + , configUnsafeUseHTTPL + , configValidateServerCertificateL + , configChannelListWidthL + , configLogMaxBufferSizeL + , configShowOlderEditsL + , configShowTypingIndicatorL + , configAbsPathL + , configUserKeysL + , configHyperlinkingModeL + , configSyntaxDirsL + , configDirectChannelExpirationDaysL + , configCpuUsagePolicyL + , configDefaultAttachmentPathL + , configChannelListOrientationL + , HelpScreen(..) , PasswordSource(..) , TokenSource(..) @@ -68,9 +108,14 @@ , attrNameToConfig + , sortTeams + , mkTeamZipper + , mkTeamZipperFromIds + , teamZipperIds , mkChannelZipperList , ChannelListGroup(..) , channelListGroupUnread + , nonDMChannelListGroupUnread , trimChannelSigil @@ -79,44 +124,51 @@ , channelSelectInput , emptyChannelSelectState + , TeamState(..) + , tsFocus + , tsMode + , tsPendingChannelChange + , tsRecentChannel + , tsReturnChannel + , tsEditState + , tsMessageSelect + , tsTeam + , tsChannelSelectState + , tsUrlList + , tsViewedMessage + , tsPostListOverlay + , tsUserListOverlay + , tsChannelListOverlay + , tsNotifyPrefs + , tsChannelTopicDialog + , tsReactionEmojiListOverlay + , tsThemeListOverlay + , ChatState , newState - , csChannelTopicDialog + , newTeamState + + , csTeamZipper + , csCurrentTeam + , csTeams + , csTeam , csChannelListOrientation , csResources - , csFocus , csCurrentChannel , csCurrentChannelId - , csUrlList - , csShowMessagePreview - , csShowChannelList - , csShowExpandedChannelTopics + , csCurrentTeamId , csPostMap - , csRecentChannel - , csReturnChannel - , csThemeListOverlay - , csPostListOverlay - , csUserListOverlay - , csChannelListOverlay - , csReactionEmojiListOverlay - , csMyTeam - , csMessageSelect , csConnectionStatus , csWorkerIsBusy , csChannel , csChannels - , csChannelSelectState - , csEditState , csClientConfig - , csPendingChannelChange - , csViewedMessage - , csNotifyPrefs + , csInputHistory , csMe , timeZone , whenMode , setMode , setMode' - , appMode , ChatEditState , emptyEditState @@ -128,7 +180,6 @@ , cedEditMode , cedEphemeral , cedEditor - , cedInputHistory , cedAutocomplete , cedAutocompletePending , cedJustCompleted @@ -188,12 +239,16 @@ , specialUserMentions + , applyTeamOrder + , refreshTeamZipper + , UserPreferences(UserPreferences) , userPrefShowJoinLeave , userPrefFlaggedPostList , userPrefGroupChannelPrefs , userPrefDirectChannelPrefs , userPrefTeammateNameDisplayMode + , userPrefTeamOrder , dmChannelShowPreference , groupChannelShowPreference @@ -217,6 +272,7 @@ , generateUUID_IO , mhSuspendAndResume , mhHandleEventLensed + , mhHandleEventLensed' , St.gets , mhError @@ -254,13 +310,11 @@ , myUser , myUsername , myUserId - , myTeamId , usernameForUserId , userByUsername , userByNickname , channelIdByChannelName , channelIdByUsername - , channelByName , userById , allUserIds , addNewUser @@ -276,7 +330,11 @@ , UserSet , ChannelSet , getHighlightSet + , emptyHSet + , moveLeft + , moveRight + , module Matterhorn.Types.Channels , module Matterhorn.Types.Messages , module Matterhorn.Types.Posts @@ -309,6 +367,7 @@ import qualified Data.Set as Set import qualified Data.ByteString as BS import qualified Data.Foldable as F +import Data.Function ( on ) import qualified Data.Kind as K import Data.Ord ( comparing ) import qualified Data.HashMap.Strict as HM @@ -378,6 +437,11 @@ channelListGroupUnread (ChannelGroupPrivateChannels n) = n channelListGroupUnread (ChannelGroupDirectMessages n) = n +nonDMChannelListGroupUnread :: ChannelListGroup -> Int +nonDMChannelListGroupUnread (ChannelGroupPublicChannels n) = n +nonDMChannelListGroupUnread (ChannelGroupPrivateChannels n) = n +nonDMChannelListGroupUnread (ChannelGroupDirectMessages _) = 0 + -- | The type of channel list entries. data ChannelListEntry = CLChannel ChannelId @@ -502,11 +566,12 @@ deriving (Eq, Show) data UserPreferences = - UserPreferences { _userPrefShowJoinLeave :: Bool - , _userPrefFlaggedPostList :: Seq FlaggedPost + UserPreferences { _userPrefShowJoinLeave :: Bool + , _userPrefFlaggedPostList :: Seq FlaggedPost , _userPrefGroupChannelPrefs :: HashMap ChannelId Bool , _userPrefDirectChannelPrefs :: HashMap UserId Bool , _userPrefTeammateNameDisplayMode :: Maybe TeammateNameDisplayMode + , _userPrefTeamOrder :: Maybe [TeamId] } hasUnread :: ChatState -> ChannelId -> Bool @@ -524,23 +589,25 @@ mkChannelZipperList :: UTCTime -> Config + -> TeamId -> Maybe ClientConfig -> UserPreferences -> ClientChannels -> Users -> [(ChannelListGroup, [ChannelListEntry])] -mkChannelZipperList now config cconfig prefs cs us = - [ let (unread, entries) = getChannelEntriesInOrder cs Ordinary +mkChannelZipperList now config tId cconfig prefs cs us = + [ let (unread, entries) = getChannelEntriesInOrder tId cs Ordinary in (ChannelGroupPublicChannels unread, entries) - , let (unread, entries) = getChannelEntriesInOrder cs Private + , let (unread, entries) = getChannelEntriesInOrder tId cs Private in (ChannelGroupPrivateChannels unread, entries) , let (unread, entries) = getDMChannelEntriesInOrder now config cconfig prefs us cs in (ChannelGroupDirectMessages unread, entries) ] -getChannelEntriesInOrder :: ClientChannels -> Type -> (Int, [ChannelListEntry]) -getChannelEntriesInOrder cs ty = - let matches (_, info) = info^.ccInfo.cdType == ty +getChannelEntriesInOrder :: TeamId -> ClientChannels -> Type -> (Int, [ChannelListEntry]) +getChannelEntriesInOrder tId cs ty = + let matches (_, info) = info^.ccInfo.cdType == ty && + info^.ccInfo.cdTeamId == Just tId pairs = filteredChannels matches cs unread = length $ filter (== True) $ (hasUnread' . snd) <$> pairs entries = fmap (CLChannel . fst) $ @@ -593,6 +660,7 @@ -> [(Bool, T.Text, ChannelListEntry)] getGroupDMChannelEntries now config prefs cs = let matches (_, info) = info^.ccInfo.cdType == Group && + info^.ccInfo.cdTeamId == Nothing && groupChannelShouldAppear now config prefs info in fmap (\(cId, ch) -> (hasUnread' ch, ch^.ccInfo.cdDisplayName, CLGroupDM cId)) $ filteredChannels matches cs @@ -668,43 +736,44 @@ -- parts of the interface. data Name = ChannelMessages ChannelId - | MessageInput - | ChannelList + | MessageInput TeamId + | ChannelList TeamId | HelpViewport | HelpText | ScriptHelpText | ThemeHelpText | SyntaxHighlightHelpText | KeybindingHelpText - | ChannelSelectString - | CompletionAlternatives - | CompletionList - | JoinChannelList - | UrlList - | MessagePreviewViewport - | ThemeListSearchInput - | UserListSearchInput - | JoinChannelListSearchInput - | UserListSearchResults - | ThemeListSearchResults - | ViewMessageArea - | ViewMessageReactionsArea - | ChannelSidebar - | ChannelSelectInput - | AttachmentList - | AttachmentFileBrowser - | MessageReactionsArea - | ReactionEmojiList - | ReactionEmojiListInput - | TabbedWindowTabBar - | MuteToggleField - | ChannelMentionsField - | DesktopNotificationsField (WithDefault NotifyOption) - | PushNotificationsField (WithDefault NotifyOption) - | ChannelTopicEditor - | ChannelTopicSaveButton - | ChannelTopicCancelButton - | ChannelTopicEditorPreview + | ChannelSelectString TeamId + | CompletionAlternatives TeamId + | CompletionList TeamId + | JoinChannelList TeamId + | UrlList TeamId + | MessagePreviewViewport TeamId + | ThemeListSearchInput TeamId + | UserListSearchInput TeamId + | JoinChannelListSearchInput TeamId + | UserListSearchResults TeamId + | ThemeListSearchResults TeamId + | ViewMessageArea TeamId + | ViewMessageReactionsArea TeamId + | ChannelSidebar TeamId + | ChannelSelectInput TeamId + | AttachmentList TeamId + | AttachmentFileBrowser TeamId + | MessageReactionsArea TeamId + | ReactionEmojiList TeamId + | ReactionEmojiListInput TeamId + | TabbedWindowTabBar TeamId + | MuteToggleField TeamId + | ChannelMentionsField TeamId + | DesktopNotificationsField TeamId (WithDefault NotifyOption) + | PushNotificationsField TeamId (WithDefault NotifyOption) + | ChannelTopicEditor TeamId + | ChannelTopicSaveButton TeamId + | ChannelTopicCancelButton TeamId + | ChannelTopicEditorPreview TeamId + | TeamList deriving (Eq, Show, Ord) -- | The sum type of exceptions we expect to encounter on authentication @@ -796,6 +865,7 @@ , _userPrefGroupChannelPrefs = mempty , _userPrefDirectChannelPrefs = mempty , _userPrefTeammateNameDisplayMode = Nothing + , _userPrefTeamOrder = Nothing } setUserPreferences :: Seq Preference -> UserPreferences -> UserPreferences @@ -819,6 +889,9 @@ (groupChannelShow gp) (_userPrefGroupChannelPrefs u) } + | Just tIds <- preferenceToTeamOrder p = + u { _userPrefTeamOrder = Just tIds + } | preferenceName p == PreferenceName "join_leave" = u { _userPrefShowJoinLeave = preferenceValue p /= PreferenceValue "false" } @@ -1010,13 +1083,6 @@ ChatEditState { _cedEditor :: Editor Text Name , _cedEditMode :: EditMode , _cedEphemeral :: EphemeralEditState - , _cedInputHistory :: InputHistory - -- ^ The map of per-channel input history for the - -- application. We don't distribute the per-channel - -- history into the per-channel states (like we do - -- for other per-channel state) since keeping it - -- under the InputHistory banner lets us use a nicer - -- startup/shutdown disk file management API. , _cedYankBuffer :: Text , _cedSpellChecker :: Maybe (Aspell, IO ()) , _cedMisspellings :: Set Text @@ -1055,21 +1121,20 @@ -- | We can initialize a new 'ChatEditState' value with just an edit -- history, which we save locally. -emptyEditState :: InputHistory -> Maybe (Aspell, IO ()) -> IO ChatEditState -emptyEditState hist sp = - return ChatEditState { _cedEditor = editor MessageInput Nothing "" - , _cedEphemeral = defaultEphemeralEditState - , _cedInputHistory = hist - , _cedEditMode = NewPost - , _cedYankBuffer = "" - , _cedSpellChecker = sp - , _cedMisspellings = mempty - , _cedAutocomplete = Nothing - , _cedAutocompletePending = Nothing - , _cedAttachmentList = list AttachmentList mempty 1 - , _cedFileBrowser = Nothing - , _cedJustCompleted = False - } +emptyEditState :: TeamId -> ChatEditState +emptyEditState tId = + ChatEditState { _cedEditor = editor (MessageInput tId) Nothing "" + , _cedEphemeral = defaultEphemeralEditState + , _cedEditMode = NewPost + , _cedYankBuffer = "" + , _cedSpellChecker = Nothing + , _cedMisspellings = mempty + , _cedAutocomplete = Nothing + , _cedAutocompletePending = Nothing + , _cedAttachmentList = list (AttachmentList tId) mempty 1 + , _cedFileBrowser = Nothing + , _cedJustCompleted = False + } -- | A 'RequestChan' is a queue of operations we have to perform in the -- background to avoid blocking on the main loop @@ -1303,21 +1368,20 @@ -- ^ Show the channel list to the right of the message area. deriving (Eq, Show) --- | This is the giant bundle of fields that represents the current --- state of our application at any given time. +-- | This type represents the current state of our application at any +-- given time. data ChatState = ChatState { _csResources :: ChatResources -- ^ Global application-wide resources that don't change -- much. - , _csFocus :: Z.Zipper ChannelListGroup ChannelListEntry - -- ^ The channel sidebar zipper that tracks which channel - -- is selected. + , _csTeams :: HashMap TeamId TeamState + -- ^ The state for each team that we are in. + , _csTeamZipper :: Z.Zipper () TeamId + -- ^ The list of teams we can cycle through. , _csChannelListOrientation :: ChannelListOrientation -- ^ The orientation of the channel list. , _csMe :: User -- ^ The authenticated user. - , _csMyTeam :: Team - -- ^ The active team of the authenticated user. , _csChannels :: ClientChannels -- ^ The channels that we are showing, including their -- message lists. @@ -1329,56 +1393,59 @@ -- ^ All of the users we know about. , _timeZone :: TimeZoneSeries -- ^ The client time zone. - , _csEditState :: ChatEditState - -- ^ The state of the input box used for composing and - -- editing messages and commands. - , _csMode :: Mode - -- ^ The current application mode. This is used to - -- dispatch to different rendering and event handling - -- routines. - , _csShowMessagePreview :: Bool - -- ^ Whether to show the message preview area. - , _csShowChannelList :: Bool - -- ^ Whether to show the channel list. - , _csShowExpandedChannelTopics :: Bool - -- ^ Whether to show expanded channel topics. - , _csChannelSelectState :: ChannelSelectState - -- ^ The state of the user's input and selection for - -- channel selection mode. - , _csRecentChannel :: Maybe ChannelId - -- ^ The most recently-selected channel, if any. - , _csReturnChannel :: Maybe ChannelId - -- ^ The channel to return to after visiting one or more - -- unread channels. - , _csUrlList :: List Name LinkChoice - -- ^ The URL list used to show URLs drawn from messages in - -- a channel. , _csConnectionStatus :: ConnectionStatus -- ^ Our view of the connection status. , _csWorkerIsBusy :: Maybe (Maybe Int) -- ^ Whether the async worker thread is busy, and its -- queue length if so. - , _csMessageSelect :: MessageSelectState - -- ^ The state of message selection mode. - , _csThemeListOverlay :: ListOverlayState InternalTheme () - -- ^ The state of the theme list overlay. - , _csPostListOverlay :: PostListOverlayState - -- ^ The state of the post list overlay. - , _csUserListOverlay :: ListOverlayState UserInfo UserSearchScope - -- ^ The state of the user list overlay. - , _csChannelListOverlay :: ListOverlayState Channel ChannelSearchScope - -- ^ The state of the user list overlay. - , _csReactionEmojiListOverlay :: ListOverlayState (Bool, T.Text) () - -- ^ The state of the reaction emoji list overlay. , _csClientConfig :: Maybe ClientConfig -- ^ The Mattermost client configuration, as we understand it. - , _csPendingChannelChange :: Maybe PendingChannelChange + , _csInputHistory :: InputHistory + -- ^ The map of per-channel input history for the + -- application. We don't distribute the per-channel + -- history into the per-channel states (like we do + -- for other per-channel state) since keeping it + -- under the InputHistory banner lets us use a nicer + -- startup/shutdown disk file management API. + } + +-- | All application state specific to a team, along with state specific +-- to our user interface's presentation of that team. We include the +-- UI state relevant to the team so that we can easily switch which +-- team the UI is presenting without having to reinitialize the UI from +-- the new team. This allows the user to be engaged in just about any +-- application activity while viewing a team, switch to another team, +-- and return to the original team and resume what they were doing, all +-- without us doing any work. +data TeamState = + TeamState { _tsFocus :: Z.Zipper ChannelListGroup ChannelListEntry + -- ^ The channel sidebar zipper that tracks which channel + -- is selected. + , _tsPendingChannelChange :: Maybe PendingChannelChange -- ^ A pending channel change that we need to apply once -- the channel in question is available. We set this up -- when we need to change to a channel in the sidebar, but -- it isn't even there yet because we haven't loaded its -- metadata. - , _csViewedMessage :: Maybe (Message, TabbedWindow ViewMessageWindowTab) + , _tsRecentChannel :: Maybe ChannelId + -- ^ The most recently-selected channel, if any. + , _tsReturnChannel :: Maybe ChannelId + -- ^ The channel to return to after visiting one or more + -- unread channels. + , _tsEditState :: ChatEditState + -- ^ The state of the input box used for composing and + -- editing messages and commands. + , _tsMessageSelect :: MessageSelectState + -- ^ The state of message selection mode. + , _tsTeam :: Team + -- ^ The team data. + , _tsChannelSelectState :: ChannelSelectState + -- ^ The state of the user's input and selection for + -- channel selection mode. + , _tsUrlList :: List Name LinkChoice + -- ^ The URL list used to show URLs drawn from messages in + -- a channel. + , _tsViewedMessage :: Maybe (Message, TabbedWindow ViewMessageWindowTab) -- ^ Set when the ViewMessage mode is active. The message -- being viewed. Note that this stores a message, not -- a message ID. That's because not all messages have @@ -1388,14 +1455,28 @@ -- consult the chat state for the latest *version* of any -- message with an ID here, to be sure that the latest -- version is used (e.g. if it gets edited, etc.). - , _csNotifyPrefs :: Maybe (Form ChannelNotifyProps MHEvent Name) + , _tsPostListOverlay :: PostListOverlayState + -- ^ The state of the post list overlay. + , _tsUserListOverlay :: ListOverlayState UserInfo UserSearchScope + -- ^ The state of the user list overlay. + , _tsChannelListOverlay :: ListOverlayState Channel ChannelSearchScope + -- ^ The state of the user list overlay. + , _tsNotifyPrefs :: Maybe (Form ChannelNotifyProps MHEvent Name) -- ^ A form for editing the notification preferences for -- the current channel. This is set when entering -- EditNotifyPrefs mode and updated when the user -- changes the form state. - , _csChannelTopicDialog :: ChannelTopicDialogState + , _tsChannelTopicDialog :: ChannelTopicDialogState -- ^ The state for the interactive channel topic editor -- window. + , _tsMode :: Mode + -- ^ The current application mode when viewing this team. + -- This is used to dispatch to different rendering and + -- event handling routines. + , _tsReactionEmojiListOverlay :: ListOverlayState (Bool, T.Text) () + -- ^ The state of the reaction emoji list overlay. + , _tsThemeListOverlay :: ListOverlayState InternalTheme () + -- ^ The state of the theme list overlay. } -- | Handles for the View Message window's tabs. @@ -1407,19 +1488,18 @@ deriving (Eq, Show) data PendingChannelChange = - ChangeByChannelId ChannelId (Maybe (MH ())) + ChangeByChannelId TeamId ChannelId (Maybe (MH ())) | ChangeByUserId UserId -- | Startup state information that is constructed prior to building a -- ChatState. data StartupStateInfo = StartupStateInfo { startupStateResources :: ChatResources - , startupStateChannelZipper :: Z.Zipper ChannelListGroup ChannelListEntry , startupStateConnectedUser :: User - , startupStateTeam :: Team + , startupStateTeams :: HM.HashMap TeamId TeamState , startupStateTimeZone :: TimeZoneSeries , startupStateInitialHistory :: InputHistory - , startupStateSpellChecker :: Maybe (Aspell, IO ()) + , startupStateInitialTeam :: TeamId } -- | The state of the channel topic editor window. @@ -1430,58 +1510,61 @@ -- ^ The window focus state (editor/buttons) } -newState :: StartupStateInfo -> IO ChatState -newState (StartupStateInfo {..}) = do - editState <- emptyEditState startupStateInitialHistory startupStateSpellChecker - let config = _crConfiguration startupStateResources - return ChatState { _csResources = startupStateResources - , _csFocus = startupStateChannelZipper - , _csChannelListOrientation = configChannelListOrientation config - , _csMe = startupStateConnectedUser - , _csMyTeam = startupStateTeam - , _csChannels = noChannels - , _csPostMap = HM.empty - , _csUsers = noUsers - , _timeZone = startupStateTimeZone - , _csEditState = editState - , _csMode = Main - , _csShowMessagePreview = configShowMessagePreview config - , _csShowChannelList = configShowChannelList config - , _csShowExpandedChannelTopics = configShowExpandedChannelTopics config - , _csChannelSelectState = emptyChannelSelectState - , _csRecentChannel = Nothing - , _csReturnChannel = Nothing - , _csUrlList = list UrlList mempty 2 - , _csConnectionStatus = Connected - , _csWorkerIsBusy = Nothing - , _csMessageSelect = MessageSelectState Nothing - , _csThemeListOverlay = nullThemeListOverlayState - , _csPostListOverlay = PostListOverlayState emptyDirSeq Nothing - , _csUserListOverlay = nullUserListOverlayState - , _csChannelListOverlay = nullChannelListOverlayState - , _csReactionEmojiListOverlay = nullEmojiListOverlayState - , _csClientConfig = Nothing - , _csPendingChannelChange = Nothing - , _csViewedMessage = Nothing - , _csNotifyPrefs = Nothing - , _csChannelTopicDialog = newChannelTopicDialog "" - } +sortTeams :: [Team] -> [Team] +sortTeams = sortBy (compare `on` (T.strip . sanitizeUserText . teamName)) +mkTeamZipper :: HM.HashMap TeamId TeamState -> Z.Zipper () TeamId +mkTeamZipper m = + let sortedTeams = sortTeams $ _tsTeam <$> HM.elems m + in mkTeamZipperFromIds $ teamId <$> sortedTeams + +mkTeamZipperFromIds :: [TeamId] -> Z.Zipper () TeamId +mkTeamZipperFromIds tIds = Z.fromList [((), tIds)] + +teamZipperIds :: Z.Zipper () TeamId -> [TeamId] +teamZipperIds = concat . fmap snd . Z.toList + +newTeamState :: Team + -> Z.Zipper ChannelListGroup ChannelListEntry + -> Maybe (Aspell, IO ()) + -> TeamState +newTeamState team chanList spellChecker = + let tId = teamId team + in TeamState { _tsMode = Main + , _tsFocus = chanList + , _tsEditState = (emptyEditState tId) { _cedSpellChecker = spellChecker } + , _tsTeam = team + , _tsUrlList = list (UrlList tId) mempty 2 + , _tsPostListOverlay = PostListOverlayState emptyDirSeq Nothing + , _tsUserListOverlay = nullUserListOverlayState tId + , _tsChannelListOverlay = nullChannelListOverlayState tId + , _tsChannelSelectState = emptyChannelSelectState tId + , _tsChannelTopicDialog = newChannelTopicDialog tId "" + , _tsMessageSelect = MessageSelectState Nothing + , _tsNotifyPrefs = Nothing + , _tsPendingChannelChange = Nothing + , _tsRecentChannel = Nothing + , _tsReturnChannel = Nothing + , _tsViewedMessage = Nothing + , _tsThemeListOverlay = nullThemeListOverlayState tId + , _tsReactionEmojiListOverlay = nullEmojiListOverlayState tId + } + -- | Make a new channel topic editor window state. -newChannelTopicDialog :: T.Text -> ChannelTopicDialogState -newChannelTopicDialog t = - ChannelTopicDialogState { _channelTopicDialogEditor = editor ChannelTopicEditor Nothing t - , _channelTopicDialogFocus = focusRing [ ChannelTopicEditor - , ChannelTopicSaveButton - , ChannelTopicCancelButton +newChannelTopicDialog :: TeamId -> T.Text -> ChannelTopicDialogState +newChannelTopicDialog tId t = + ChannelTopicDialogState { _channelTopicDialogEditor = editor (ChannelTopicEditor tId) Nothing t + , _channelTopicDialogFocus = focusRing [ ChannelTopicEditor tId + , ChannelTopicSaveButton tId + , ChannelTopicCancelButton tId ] } -nullChannelListOverlayState :: ListOverlayState Channel ChannelSearchScope -nullChannelListOverlayState = - let newList rs = list JoinChannelList rs 2 +nullChannelListOverlayState :: TeamId -> ListOverlayState Channel ChannelSearchScope +nullChannelListOverlayState tId = + let newList rs = list (JoinChannelList tId) rs 2 in ListOverlayState { _listOverlaySearchResults = newList mempty - , _listOverlaySearchInput = editor JoinChannelListSearchInput (Just 1) "" + , _listOverlaySearchInput = editor (JoinChannelListSearchInput tId) (Just 1) "" , _listOverlaySearchScope = AllChannels , _listOverlaySearching = False , _listOverlayEnterHandler = const $ return False @@ -1491,11 +1574,11 @@ , _listOverlayReturnMode = Main } -nullThemeListOverlayState :: ListOverlayState InternalTheme () -nullThemeListOverlayState = - let newList rs = list ThemeListSearchResults rs 3 +nullThemeListOverlayState :: TeamId -> ListOverlayState InternalTheme () +nullThemeListOverlayState tId = + let newList rs = list (ThemeListSearchResults tId) rs 3 in ListOverlayState { _listOverlaySearchResults = newList mempty - , _listOverlaySearchInput = editor ThemeListSearchInput (Just 1) "" + , _listOverlaySearchInput = editor (ThemeListSearchInput tId) (Just 1) "" , _listOverlaySearchScope = () , _listOverlaySearching = False , _listOverlayEnterHandler = const $ return False @@ -1505,11 +1588,11 @@ , _listOverlayReturnMode = Main } -nullUserListOverlayState :: ListOverlayState UserInfo UserSearchScope -nullUserListOverlayState = - let newList rs = list UserListSearchResults rs 1 +nullUserListOverlayState :: TeamId -> ListOverlayState UserInfo UserSearchScope +nullUserListOverlayState tId = + let newList rs = list (UserListSearchResults tId) rs 1 in ListOverlayState { _listOverlaySearchResults = newList mempty - , _listOverlaySearchInput = editor UserListSearchInput (Just 1) "" + , _listOverlaySearchInput = editor (UserListSearchInput tId) (Just 1) "" , _listOverlaySearchScope = AllUsers Nothing , _listOverlaySearching = False , _listOverlayEnterHandler = const $ return False @@ -1519,11 +1602,11 @@ , _listOverlayReturnMode = Main } -nullEmojiListOverlayState :: ListOverlayState (Bool, T.Text) () -nullEmojiListOverlayState = - let newList rs = list ReactionEmojiList rs 1 +nullEmojiListOverlayState :: TeamId -> ListOverlayState (Bool, T.Text) () +nullEmojiListOverlayState tId = + let newList rs = list (ReactionEmojiList tId) rs 1 in ListOverlayState { _listOverlaySearchResults = newList mempty - , _listOverlaySearchInput = editor ReactionEmojiListInput (Just 1) "" + , _listOverlaySearchInput = editor (ReactionEmojiListInput tId) (Just 1) "" , _listOverlaySearchScope = () , _listOverlaySearching = False , _listOverlayEnterHandler = const $ return False @@ -1533,26 +1616,15 @@ , _listOverlayReturnMode = MessageSelect } -getServerBaseUrl :: MH TeamBaseURL -getServerBaseUrl = do - st <- use id - return $ serverBaseUrl st - -serverBaseUrl :: ChatState -> TeamBaseURL -serverBaseUrl st = - let baseUrl = connectionDataURL $ _crConn $ _csResources st - tName = teamName $ _csMyTeam st - in TeamBaseURL (TeamURLName $ sanitizeUserText tName) baseUrl - -- | The state of channel selection mode. data ChannelSelectState = ChannelSelectState { _channelSelectInput :: Editor Text Name , _channelSelectMatches :: Z.Zipper ChannelListGroup ChannelSelectMatch } -emptyChannelSelectState :: ChannelSelectState -emptyChannelSelectState = - ChannelSelectState { _channelSelectInput = editor ChannelSelectInput (Just 1) "" +emptyChannelSelectState :: TeamId -> ChannelSelectState +emptyChannelSelectState tId = + ChannelSelectState { _channelSelectInput = editor (ChannelSelectInput tId) (Just 1) "" , _channelSelectMatches = Z.fromList [] } @@ -1732,6 +1804,13 @@ n <- R.lift $ St.lift $ f event (st ^. ln) St.put (s { mhCurrentState = st & ln .~ n }) +mhHandleEventLensed' :: Lens' ChatState b -> (b -> EventM Name b) -> MH () +mhHandleEventLensed' ln f = MH $ do + s <- St.get + let st = mhCurrentState s + n <- R.lift $ St.lift $ f (st ^. ln) + St.put (s { mhCurrentState = st & ln .~ n }) + mhSuspendAndResume :: (ChatState -> IO ChatState) -> MH () mhSuspendAndResume mote = MH $ do s <- St.get @@ -1846,6 +1925,7 @@ makeLenses ''ChatResources makeLenses ''ChatState +makeLenses ''TeamState makeLenses ''ChatEditState makeLenses ''AutocompleteState makeLenses ''PostListOverlayState @@ -1854,7 +1934,60 @@ makeLenses ''UserPreferences makeLenses ''ConnectionInfo makeLenses ''ChannelTopicDialogState +Brick.suffixLenses ''Config +applyTeamOrderPref :: Maybe [TeamId] -> ChatState -> ChatState +applyTeamOrderPref Nothing st = st +applyTeamOrderPref (Just prefTIds) st = + let teams = _csTeams st + ourTids = HM.keys teams + tIds = filter (`elem` ourTids) prefTIds + curTId = st^.csCurrentTeamId + unmentioned = filter (not . wasMentioned) $ HM.elems teams + wasMentioned ts = (teamId $ _tsTeam ts) `elem` tIds + zipperTids = tIds <> (teamId <$> sortTeams (_tsTeam <$> unmentioned)) + in st { _csTeamZipper = (Z.findRight (== curTId) $ mkTeamZipperFromIds zipperTids) + } + +refreshTeamZipper :: MH () +refreshTeamZipper = do + tidOrder <- use (csResources.crUserPreferences.userPrefTeamOrder) + St.modify (applyTeamOrderPref tidOrder) + +applyTeamOrder :: [TeamId] -> MH () +applyTeamOrder tIds = St.modify (applyTeamOrderPref $ Just tIds) + +newState :: StartupStateInfo -> ChatState +newState (StartupStateInfo {..}) = + let config = _crConfiguration startupStateResources + in applyTeamOrderPref (_userPrefTeamOrder $ _crUserPreferences startupStateResources) $ + ChatState { _csResources = startupStateResources + , _csTeamZipper = Z.findRight (== startupStateInitialTeam) $ + mkTeamZipper startupStateTeams + , _csTeams = startupStateTeams + , _csChannelListOrientation = configChannelListOrientation config + , _csMe = startupStateConnectedUser + , _csChannels = noChannels + , _csPostMap = HM.empty + , _csUsers = noUsers + , _timeZone = startupStateTimeZone + , _csConnectionStatus = Connected + , _csWorkerIsBusy = Nothing + , _csClientConfig = Nothing + , _csInputHistory = startupStateInitialHistory + } + +getServerBaseUrl :: TeamId -> MH TeamBaseURL +getServerBaseUrl tId = do + st <- use id + return $ serverBaseUrl st tId + +serverBaseUrl :: ChatState -> TeamId -> TeamBaseURL +serverBaseUrl st tId = + let baseUrl = connectionDataURL $ _crConn $ _csResources st + tName = teamName $ st^.csTeam(tId).tsTeam + in TeamBaseURL (TeamURLName $ sanitizeUserText tName) baseUrl + getSession :: MH Session getSession = use (csResources.crSession) @@ -1863,19 +1996,16 @@ whenMode :: Mode -> MH () -> MH () whenMode m act = do - curMode <- use csMode + curMode <- use (csCurrentTeam.tsMode) when (curMode == m) act setMode :: Mode -> MH () setMode m = do - csMode .= m + csCurrentTeam.tsMode .= m mh invalidateCache setMode' :: Mode -> ChatState -> ChatState -setMode' m = csMode .~ m - -appMode :: ChatState -> Mode -appMode = _csMode +setMode' m = csCurrentTeam.tsMode .~ m resetSpellCheckTimer :: ChatEditState -> IO () resetSpellCheckTimer s = @@ -1884,9 +2014,24 @@ Just (_, reset) -> reset -- ** Utility Lenses -csCurrentChannelId :: SimpleGetter ChatState ChannelId -csCurrentChannelId = csFocus.to Z.unsafeFocus.to channelListEntryChannelId +csCurrentChannelId :: TeamId -> SimpleGetter ChatState ChannelId +csCurrentChannelId tId = + csTeam(tId).tsFocus.to Z.unsafeFocus.to channelListEntryChannelId +csCurrentTeamId :: SimpleGetter ChatState TeamId +csCurrentTeamId = + csTeamZipper.to Z.unsafeFocus + +csCurrentTeam :: Lens' ChatState TeamState +csCurrentTeam = + lens (\st -> st^.csTeam(st^.csCurrentTeamId)) + (\st t -> st & csTeam(st^.csCurrentTeamId) .~ t) + +csTeam :: TeamId -> Lens' ChatState TeamState +csTeam tId = + lens (\ st -> st ^. csTeams . at tId ^?! _Just) + (\ st t -> st & csTeams . at tId .~ Just t) + channelListEntryChannelId :: ChannelListEntry -> ChannelId channelListEntryChannelId (CLChannel cId) = cId channelListEntryChannelId (CLUserDM cId _) = cId @@ -1907,8 +2052,8 @@ csCurrentChannel :: Lens' ChatState ClientChannel csCurrentChannel = - lens (\ st -> findChannelById (st^.csCurrentChannelId) (st^.csChannels) ^?! _Just) - (\ st n -> st & csChannels %~ addChannel (st^.csCurrentChannelId) n) + lens (\ st -> findChannelById (st^.csCurrentChannelId(st^.csCurrentTeamId)) (st^.csChannels) ^?! _Just) + (\ st n -> st & csChannels %~ addChannel (st^.csCurrentChannelId(st^.csCurrentTeamId)) n) csChannel :: ChannelId -> Traversal' ChatState ClientChannel csChannel cId = @@ -1982,7 +2127,9 @@ setUserStatus :: UserId -> Text -> MH () setUserStatus uId t = do csUsers %= modifyUserById uId (uiStatus .~ statusFromText t) - mh $ invalidateCacheEntry ChannelSidebar + cs <- use csChannels + forM_ (allTeamIds cs) $ \tId -> + mh $ invalidateCacheEntry $ ChannelSidebar tId usernameForUserId :: UserId -> ChatState -> Maybe Text usernameForUserId uId st = _uiName <$> findUserById uId (st^.csUsers) @@ -2001,7 +2148,8 @@ channelIdByChannelName :: Text -> ChatState -> Maybe ChannelId channelIdByChannelName name st = - let matches (_, cc) = cc^.ccInfo.cdName == (trimChannelSigil name) + let matches (_, cc) = cc^.ccInfo.cdName == (trimChannelSigil name) && + cc^.ccInfo.cdTeamId == (Just $ st^.csCurrentTeamId) in listToMaybe $ fst <$> filteredChannels matches (st^.csChannels) channelIdByUsername :: Text -> ChatState -> Maybe ChannelId @@ -2013,11 +2161,6 @@ useNickname st = useNickname' (st^.csClientConfig) (st^.csResources.crUserPreferences) -channelByName :: Text -> ChatState -> Maybe ClientChannel -channelByName n st = do - cId <- channelIdByChannelName n st - findChannelById cId (st^.csChannels) - trimChannelSigil :: Text -> Text trimChannelSigil n | normalChannelSigil `T.isPrefixOf` n = T.tail n @@ -2038,8 +2181,8 @@ resetAutocomplete :: MH () resetAutocomplete = do - csEditState.cedAutocomplete .= Nothing - csEditState.cedAutocompletePending .= Nothing + csCurrentTeam.tsEditState.cedAutocomplete .= Nothing + csCurrentTeam.tsEditState.cedAutocompletePending .= Nothing -- * Slash Commands @@ -2090,9 +2233,6 @@ myUserId :: ChatState -> UserId myUserId st = myUser st ^. userIdL -myTeamId :: ChatState -> TeamId -myTeamId st = st ^. csMyTeam . teamIdL - myUser :: ChatState -> User myUser st = st^.csMe @@ -2131,12 +2271,16 @@ , hSyntaxMap :: SyntaxMap } +emptyHSet :: HighlightSet +emptyHSet = HighlightSet Set.empty Set.empty mempty + getHighlightSet :: ChatState -> HighlightSet getHighlightSet st = - HighlightSet { hUserSet = addSpecialUserMentions $ getUsernameSet $ st^.csUsers - , hChannelSet = getChannelNameSet $ st^.csChannels - , hSyntaxMap = st^.csResources.crSyntaxMap - } + let tId = st^.csCurrentTeamId + in HighlightSet { hUserSet = addSpecialUserMentions $ getUsernameSet $ st^.csUsers + , hChannelSet = getChannelNameSet tId $ st^.csChannels + , hSyntaxMap = st^.csResources.crSyntaxMap + } attrNameToConfig :: Brick.AttrName -> Text attrNameToConfig = T.pack . intercalate "." . Brick.attrNameComponents @@ -2163,3 +2307,22 @@ mh $ invalidateCacheEntry (ChannelMessages cId) csChannel(cId) %= (clearNewMessageIndicator . clearEditedThreshold) + +moveLeft :: (Eq a) => a -> [a] -> [a] +moveLeft v as = + case elemIndex v as of + Nothing -> as + Just 0 -> as + Just i -> + let (h, t) = splitAt i as + in init h <> [v, last h] <> tail t + +moveRight :: (Eq a) => a -> [a] -> [a] +moveRight v as = + case elemIndex v as of + Nothing -> as + Just i + | i == length as - 1 -> as + | otherwise -> + let (h, t) = splitAt i as + in h <> [head (tail t), v] <> (tail (tail t)) diff --git a/src/Matterhorn/Types/Channels.hs b/src/Matterhorn/Types/Channels.hs --- a/src/Matterhorn/Types/Channels.hs +++ b/src/Matterhorn/Types/Channels.hs @@ -3,6 +3,7 @@ {-# LANGUAGE DeriveFoldable #-} {-# LANGUAGE DeriveTraversable #-} {-# LANGUAGE RankNTypes #-} +{-# LANGUAGE FlexibleInstances #-} module Matterhorn.Types.Channels ( ClientChannel(..) @@ -20,7 +21,7 @@ , cdViewed, cdNewMessageIndicator, cdEditedMessageThreshold, cdUpdated , cdName, cdDisplayName, cdHeader, cdPurpose, cdType , cdMentionCount, cdTypingUsers, cdDMUserId, cdChannelId - , cdSidebarShowOverride, cdNotifyProps + , cdSidebarShowOverride, cdNotifyProps, cdTeamId -- * Lenses created for accessing ChannelContents fields , cdMessages, cdFetchPending -- * Creating ClientChannel objects @@ -28,6 +29,7 @@ -- * Managing ClientChannel collections , noChannels, addChannel, removeChannel, findChannelById, modifyChannelById , channelByIdL, maybeChannelByIdL + , allTeamIds , filteredChannelIds , filteredChannels -- * Creating ChannelInfo objects @@ -77,6 +79,7 @@ , NotifyOption(..) , WithDefault(..) , ServerTime + , TeamId , emptyChannelNotifyProps ) @@ -141,6 +144,7 @@ initialChannelInfo myId chan = let updated = chan ^. channelLastPostAtL in ChannelInfo { _cdChannelId = chan^.channelIdL + , _cdTeamId = chan^.channelTeamIdL , _cdViewed = Nothing , _cdNewMessageIndicator = Hide , _cdEditedMessageThreshold = Nothing @@ -205,6 +209,8 @@ data ChannelInfo = ChannelInfo { _cdChannelId :: ChannelId -- ^ The channel's ID + , _cdTeamId :: Maybe TeamId + -- ^ The channel's team ID , _cdViewed :: Maybe ServerTime -- ^ The last time we looked at a channel , _cdNewMessageIndicator :: NewMessageIndicator @@ -281,8 +287,8 @@ -- | Define a binary kinded type to allow derivation of functor. data AllMyChannels a = AllChannels { _chanMap :: HashMap ChannelId a + , _channelNameSet :: HashMap TeamId (S.Set Text) , _userChannelMap :: HashMap UserId ChannelId - , _channelNameSet :: S.Set Text } deriving (Functor, Foldable, Traversable) @@ -292,19 +298,23 @@ makeLenses ''AllMyChannels -getChannelNameSet :: ClientChannels -> S.Set Text -getChannelNameSet = _channelNameSet +getChannelNameSet :: TeamId -> ClientChannels -> S.Set Text +getChannelNameSet tId cs = case cs^.channelNameSet.at tId of + Nothing -> mempty + Just s -> s -- | Initial collection of Channels with no members noChannels :: ClientChannels -noChannels = AllChannels HM.empty HM.empty mempty +noChannels = AllChannels HM.empty HM.empty HM.empty -- | Add a channel to the existing collection. addChannel :: ChannelId -> ClientChannel -> ClientChannels -> ClientChannels addChannel cId cinfo = (chanMap %~ HM.insert cId cinfo) . (if cinfo^.ccInfo.cdType `notElem` [Direct, Group] - then channelNameSet %~ S.insert (cinfo^.ccInfo.cdName) + then case cinfo^.ccInfo.cdTeamId of + Nothing -> id + Just tId -> channelNameSet %~ HM.insertWith S.union tId (S.singleton $ cinfo^.ccInfo.cdName) else id) . (case cinfo^.ccInfo.cdDMUserId of Nothing -> id @@ -317,11 +327,21 @@ let mChan = findChannelById cId cs removeChannelName = case mChan of Nothing -> id - Just ch -> channelNameSet %~ S.delete (ch^.ccInfo.cdName) + Just ch -> case ch^.ccInfo.cdTeamId of + Nothing -> id + Just tId -> channelNameSet %~ HM.adjust (S.delete (ch^.ccInfo.cdName)) tId in cs & chanMap %~ HM.delete cId & removeChannelName & userChannelMap %~ HM.filter (/= cId) +instance Semigroup (AllMyChannels ClientChannel) where + a <> b = + let pairs = HM.toList $ _chanMap a + in foldr (uncurry addChannel) b pairs + +instance Monoid (AllMyChannels ClientChannel) where + mempty = noChannels + getDmChannelFor :: UserId -> ClientChannels -> Maybe ChannelId getDmChannelFor uId cs = cs^.userChannelMap.at uId @@ -351,6 +371,10 @@ -- ChannelId values for which the filter matched. filteredChannelIds :: (ClientChannel -> Bool) -> ClientChannels -> [ChannelId] filteredChannelIds f cc = fst <$> filter (f . snd) (HM.toList (cc^.chanMap)) + +-- | Get all the team IDs in the channel collection. +allTeamIds :: ClientChannels -> [TeamId] +allTeamIds cc = HM.keys $ cc^.channelNameSet -- | Filter the ClientChannel collection, keeping only those for which -- the provided filter test function returns True. diff --git a/src/Matterhorn/Types/Common.hs b/src/Matterhorn/Types/Common.hs --- a/src/Matterhorn/Types/Common.hs +++ b/src/Matterhorn/Types/Common.hs @@ -10,6 +10,7 @@ import Matterhorn.Prelude import qualified Data.Text as T +import Data.Char ( isPrint ) import Network.Mattermost.Types ( UserText, unsafeUserText, UserId(..), Id(..) ) @@ -18,9 +19,9 @@ sanitizeUserText' :: T.Text -> T.Text sanitizeUserText' = + T.filter (\c -> isPrint c || c == '\n') . -- remove non-printable T.replace "\ESC" "" . - T.replace "\t" " " . - T.filter (\c -> c >= ' ' || c == '\n') -- remove non-printable + T.replace "\t" " " -- | Extract the corresponding other user from a direct channel name. -- Returns Nothing if the string is not a direct channel name or if it diff --git a/src/Matterhorn/Types/KeyEvents.hs b/src/Matterhorn/Types/KeyEvents.hs --- a/src/Matterhorn/Types/KeyEvents.hs +++ b/src/Matterhorn/Types/KeyEvents.hs @@ -125,6 +125,12 @@ -- Form submission | FormSubmitEvent + + -- Team switching + | NextTeamEvent + | PrevTeamEvent + | MoveCurrentTeamLeftEvent + | MoveCurrentTeamRightEvent deriving (Eq, Show, Ord, Enum) allEvents :: [KeyEvent] @@ -198,6 +204,11 @@ , SearchSelectUpEvent , SearchSelectDownEvent + , NextTeamEvent + , PrevTeamEvent + , MoveCurrentTeamLeftEvent + , MoveCurrentTeamRightEvent + , FlagMessageEvent , PinMessageEvent , ViewMessageEvent @@ -388,6 +399,11 @@ EditorHomeEvent -> "editor-home" EditorEndEvent -> "editor-end" EditorYankEvent -> "editor-yank" + + NextTeamEvent -> "next-team" + PrevTeamEvent -> "prev-team" + MoveCurrentTeamLeftEvent -> "move-current-team-left" + MoveCurrentTeamRightEvent -> "move-current-team-right" EnterFlaggedPostsEvent -> "show-flagged-posts" ToggleChannelListVisibleEvent -> "toggle-channel-list-visibility" diff --git a/src/Matterhorn/Types/Messages.hs b/src/Matterhorn/Types/Messages.hs --- a/src/Matterhorn/Types/Messages.hs +++ b/src/Matterhorn/Types/Messages.hs @@ -124,11 +124,7 @@ import Matterhorn.Types.DirectionalSeq import Matterhorn.Types.Posts -import Matterhorn.Types.RichText ( RichTextBlock(..), Element(..) - , ElementData(..), findUsernames, blockGetURLs - , ElementStyle(..), URL(..), parseMarkdown - , TeamURLName - ) +import Matterhorn.Types.RichText -- | The state of a message's thread context. @@ -157,7 +153,7 @@ -- | A 'Message' is any message we might want to render, either from -- Mattermost itself or from a client-internal source. data Message = Message - { _mText :: Seq RichTextBlock + { _mText :: Blocks , _mMarkdownSource :: Text , _mUser :: UserRef , _mDate :: ServerTime @@ -294,7 +290,7 @@ data LinkChoice = LinkChoice { _linkTime :: ServerTime , _linkUser :: UserRef - , _linkLabel :: Maybe (Seq Element) + , _linkLabel :: Maybe Inlines , _linkTarget :: LinkTarget } deriving (Eq, Show) @@ -734,7 +730,7 @@ mkTarget (Right url) = LinkURL url mkTarget (Left (tName, pId)) = LinkPermalink tName pId mkEntry (val, text) = LinkChoice (msg^.mDate) uRef text (mkTarget val) - msgUrls = mkEntry <$> (Seq.fromList $ mconcat $ blockGetURLs <$> (toList $ msg^.mText)) + msgUrls = mkEntry <$> (Seq.fromList $ mconcat $ blockGetURLs <$> (F.toList $ unBlocks $ msg^.mText)) attachmentURLs = (\ a -> LinkChoice (msg^.mDate) @@ -743,8 +739,8 @@ (LinkFileId $ a^.attachmentFileId)) <$> (msg^.mAttachments) attachmentLabel a = - Seq.fromList [ Element Normal $ EText "attachment" - , Element Normal ESpace - , Element Code $ EText $ a^.attachmentName - ] + Inlines $ Seq.fromList [ EText "attachment" + , ESpace + , ECode $ Inlines $ Seq.singleton $ EText $ a^.attachmentName + ] in msgUrls <> attachmentURLs diff --git a/src/Matterhorn/Types/Posts.hs b/src/Matterhorn/Types/Posts.hs --- a/src/Matterhorn/Types/Posts.hs +++ b/src/Matterhorn/Types/Posts.hs @@ -59,7 +59,7 @@ import Network.Mattermost.Types import Matterhorn.Types.Common -import Matterhorn.Types.RichText ( RichTextBlock(Blockquote), parseMarkdown +import Matterhorn.Types.RichText ( Blocks(..), Block(Blockquote), parseMarkdown , TeamBaseURL ) @@ -112,7 +112,7 @@ -- the Mattermost 'Post' type, with unnecessary information -- removed and some preprocessing done. data ClientPost = ClientPost - { _cpText :: Seq RichTextBlock + { _cpText :: Blocks , _cpMarkdownSource :: Text , _cpUser :: Maybe UserId , _cpUserOverride :: Maybe Text @@ -193,10 +193,10 @@ -- | Convert a Mattermost 'Post' to a 'ClientPost', passing in a -- 'ParentId' if it has a known one. -toClientPost :: TeamBaseURL -> Post -> Maybe PostId -> ClientPost +toClientPost :: Maybe TeamBaseURL -> Post -> Maybe PostId -> ClientPost toClientPost baseUrl p parentId = let src = unEmote (postClientPostType p) $ sanitizeUserText $ postMessage p - in ClientPost { _cpText = parseMarkdown (Just baseUrl) src <> getAttachmentText p + in ClientPost { _cpText = parseMarkdown baseUrl src <> getAttachmentText p , _cpMarkdownSource = src , _cpUser = postUserId p , _cpUserOverride = p^.postPropsL.postPropsOverrideUsernameL @@ -216,12 +216,12 @@ -- | Right now, instead of treating 'attachment' properties specially, we're -- just going to roll them directly into the message text -getAttachmentText :: Post -> Seq RichTextBlock +getAttachmentText :: Post -> Blocks getAttachmentText p = case p^.postPropsL.postPropsAttachmentsL of - Nothing -> Seq.empty + Nothing -> mempty Just attachments -> - fmap (Blockquote . render) attachments + Blocks $ fmap (Blockquote . render) attachments where render att = parseMarkdown Nothing (att^.ppaTextL) <> parseMarkdown Nothing (att^.ppaFallbackL) diff --git a/src/Matterhorn/Types/RichText.hs b/src/Matterhorn/Types/RichText.hs --- a/src/Matterhorn/Types/RichText.hs +++ b/src/Matterhorn/Types/RichText.hs @@ -1,18 +1,29 @@ +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE MultiParamTypeClasses #-} -- | This module provides a set of data types to represent message text. --- The types here are based loosely on the @cheapskate@ package's types --- but provide higher-level support for the kinds of things we find in --- Mattermost messages such as user and channel references. +-- The inline and block types in this module are designed to represent +-- most of what is found in Markdown documents (particularly the +-- Commonmark specification) in addition to other things we find in +-- Mattermost messages, such as username or channel references. -- -- To parse a Markdown document, use 'parseMarkdown'. To actually render -- text in this representation, see the module 'Draw.RichText'. module Matterhorn.Types.RichText - ( RichTextBlock(..) - , ListType(..) + ( Blocks(..) + , unBlocks + + , Block(..) + , sameBlockType , CodeBlockInfo(..) - , NumDecoration(..) - , Element(..) - , ElementData(..) - , ElementStyle(..) + , Inline(..) + , Inlines(..) + , unInlines + + , C.ListType(..) + , C.ListSpacing(..) + , C.EnumeratorType(..) + , C.DelimiterType(..) + , TeamBaseURL(..) , TeamURLName(..) @@ -20,32 +31,33 @@ , unURL , parseMarkdown - , setElementStyle , findUsernames , blockGetURLs , findVerbatimChunk - - -- Exposed for testing only: - , fromMarkdownBlocks ) where import Prelude () import Matterhorn.Prelude -import qualified Cheapskate as C -import Data.Char ( isAlphaNum, isAlpha ) +import qualified Commonmark as C +import qualified Commonmark.Extensions as C +import qualified Commonmark.Inlines as C +import qualified Commonmark.TokParsers as C +import Control.Monad.Identity import qualified Data.Foldable as F +import Data.List ( intersperse ) import Data.Monoid (First(..)) import qualified Data.Set as S import qualified Data.Sequence as Seq -import Data.Sequence ( (<|), ViewL((:<)) ) +import Data.Sequence ( (<|), viewl, viewr, ViewL((:<)), ViewR((:>)) ) import qualified Data.Text as T +import qualified Text.Parsec as P import Network.Mattermost.Types ( PostId(..), Id(..), ServerBaseURL(..) ) -import Matterhorn.Constants ( userSigil, normalChannelSigil ) +import Matterhorn.Constants ( userSigilChar, normalChannelSigilChar ) -- | A team name found in a Mattermost post URL data TeamURLName = TeamURLName Text @@ -55,15 +67,28 @@ data TeamBaseURL = TeamBaseURL TeamURLName ServerBaseURL deriving (Eq, Show) +-- | A sequence of rich text blocks. +newtype Blocks = Blocks (Seq Block) + deriving (Semigroup, Monoid, Show) + +unBlocks :: Blocks -> Seq Block +unBlocks (Blocks bs) = bs + +singleB :: Block -> Blocks +singleB = Blocks . Seq.singleton + -- | A block in a rich text document. -data RichTextBlock = - Para (Seq Element) +-- +-- NOTE: update 'sameBlockType' when constructors are added to this +-- type. +data Block = + Para Inlines -- ^ A paragraph. - | Header Int (Seq Element) + | Header Int Inlines -- ^ A section header with specified depth and contents. - | Blockquote (Seq RichTextBlock) + | Blockquote Blocks -- ^ A blockquote. - | List Bool ListType (Seq (Seq RichTextBlock)) + | List C.ListType C.ListSpacing (Seq Blocks) -- ^ An itemized list. | CodeBlock CodeBlockInfo Text -- ^ A code block. @@ -73,14 +98,15 @@ -- ^ A horizontal rule. deriving (Show) --- | The type of itemized list items. -data ListType = - Bullet Char - -- ^ Decorate the items with bullet using the specified character. - | Numbered NumDecoration Int - -- ^ Number the items starting at the specified number; use the - -- indicated decoration following the number. - deriving (Eq, Show, Ord) +-- | Returns whether two blocks have the same type. +sameBlockType :: Block -> Block -> Bool +sameBlockType (Para {}) (Para {}) = True +sameBlockType (Header {}) (Header {}) = True +sameBlockType (Blockquote {}) (Blockquote {}) = True +sameBlockType (List {}) (List {}) = True +sameBlockType (CodeBlock {}) (CodeBlock {}) = True +sameBlockType (HTMLBlock {}) (HTMLBlock {}) = True +sameBlockType _ _ = False -- | Information about a code block. data CodeBlockInfo = @@ -96,25 +122,6 @@ } deriving (Eq, Show, Ord) --- | Ways to decorate numbered itemized list items. The decoration --- follows the list item number. -data NumDecoration = - Paren - | Period - deriving (Eq, Show, Ord) - --- | A single logical inline element in a rich text block. -data Element = - Element { eStyle :: ElementStyle - -- ^ The element's visual style. - , eData :: ElementData - -- ^ The element's data. - } - deriving (Show, Eq, Ord) - -setElementStyle :: ElementStyle -> Element -> Element -setElementStyle s e = e { eStyle = s } - -- | A URL. newtype URL = URL Text deriving (Eq, Show, Ord) @@ -122,9 +129,18 @@ unURL :: URL -> Text unURL (URL url) = url --- | The kinds of data that can appear in rich text elements. -data ElementData = +-- | The kinds of inline values that can appear in rich text blocks. +data Inline = EText Text + -- ^ Plain text that SHOULD be a contiguous sequence of + -- non-whitespace characters. + | EEmph Inlines + -- ^ Emphasized (usually italicized) content. + | EStrikethrough Inlines + -- ^ Strikethrough content. + | EStrong Inlines + -- ^ Boldface content. + | ECode Inlines -- ^ A sequence of non-whitespace characters. | ESpace -- ^ A single space. @@ -147,261 +163,197 @@ | EChannel Text -- ^ A channel reference. The text here includes only the channel -- name, not the sigil. - | EHyperlink URL (Maybe (Seq Element)) + | EHyperlink URL Inlines -- ^ A hyperlink to the specified URL. Optionally provides an -- element sequence indicating the URL's text label; if absent, the -- label is understood to be the URL itself. - | EImage URL (Maybe (Seq Element)) + | EImage URL Inlines -- ^ An image at the specified URL. Optionally provides an element -- sequence indicating the image's "alt" text label; if absent, the -- label is understood to be the URL itself. | EEmoji Text -- ^ An emoji reference. The text here includes only the text -- portion, not the colons, e.g. "foo" instead of ":foo:". - | ENonBreaking (Seq Element) + | ENonBreaking Inlines -- ^ A sequence of elements that must never be separated during line -- wrapping. - | EPermalink TeamURLName PostId (Maybe (Seq Element)) + | EPermalink TeamURLName PostId (Maybe Inlines) -- ^ A permalink to the specified team (name) and post ID with an -- optional label. deriving (Show, Eq, Ord) --- | Element visual styles. -data ElementStyle = - Normal - -- ^ Normal text - | Emph - -- ^ Emphasized text - | Strikethrough - -- ^ Strikethrough text - | Strong - -- ^ Bold text - | Code - -- ^ Inline code segment or code block - | Hyperlink URL ElementStyle - -- ^ A terminal hyperlink to the specified URL, composed with - -- another element style - | Permalink - -- ^ A post permalink - deriving (Eq, Show, Ord) +-- | A sequence of inline values. +newtype Inlines = Inlines (Seq Inline) + deriving (Monoid, Ord, Eq, Show) -parseMarkdown :: Maybe TeamBaseURL -> T.Text -> Seq RichTextBlock -parseMarkdown baseUrl t = - fromMarkdownBlocks baseUrl bs where C.Doc _ bs = C.markdown C.def t +unInlines :: Inlines -> Seq Inline +unInlines (Inlines is) = is --- | Convert a sequence of markdown (Cheapskate) blocks into rich text --- blocks. -fromMarkdownBlocks :: Maybe TeamBaseURL -> C.Blocks -> Seq RichTextBlock -fromMarkdownBlocks baseUrl = fmap (fromMarkdownBlock baseUrl) +singleI :: Inline -> Inlines +singleI = Inlines . Seq.singleton --- | Convert a single markdown block into a single rich text block. -fromMarkdownBlock :: Maybe TeamBaseURL -> C.Block -> RichTextBlock -fromMarkdownBlock baseUrl (C.Para is) = - Para $ fromMarkdownInlines baseUrl is -fromMarkdownBlock baseUrl (C.Header level is) = - Header level $ fromMarkdownInlines baseUrl is -fromMarkdownBlock baseUrl (C.Blockquote bs) = - Blockquote $ fromMarkdownBlock baseUrl <$> bs -fromMarkdownBlock baseUrl (C.List f ty bss) = - List f (fromMarkdownListType ty) $ fmap (fromMarkdownBlock baseUrl) <$> Seq.fromList bss -fromMarkdownBlock _ (C.CodeBlock attr body) = - CodeBlock (fromMarkdownCodeAttr attr) body -fromMarkdownBlock _ (C.HtmlBlock body) = - HTMLBlock body -fromMarkdownBlock _ C.HRule = - HRule +instance Semigroup Inlines where + (Inlines l) <> (Inlines r) = + Inlines $ case (viewr l, viewl r) of + (lInit :> lLast, rHead :< rTail) -> + case (lLast, rHead) of + (EText a, EText b) -> + lInit <> ((EText $ a <> b) <| rTail) + (ECode a, ECode b) -> + lInit <> ((ECode $ a <> b) <| rTail) + (EEmph a, EEmph b) -> + lInit <> ((EEmph $ a <> b) <| rTail) + (EStrikethrough a, EStrikethrough b) -> + lInit <> ((EStrikethrough $ a <> b) <| rTail) + (EStrong a, EStrong b) -> + lInit <> ((EStrong $ a <> b) <| rTail) + (_, _) -> + l <> r + (_, _) -> l <> r -fromMarkdownCodeAttr :: C.CodeAttr -> CodeBlockInfo -fromMarkdownCodeAttr (C.CodeAttr lang info) = - let strippedLang = T.strip lang - strippedInfo = T.strip info - maybeText t = if T.null t then Nothing else Just t - in CodeBlockInfo (maybeText strippedLang) - (maybeText strippedInfo) +-- A dummy instance just to satisfy commonmark; we don't use this. +instance C.Rangeable Inlines where + ranged _ = id -fromMarkdownListType :: C.ListType -> ListType -fromMarkdownListType (C.Bullet c) = - Bullet c -fromMarkdownListType (C.Numbered wrap i) = - let dec = case wrap of - C.PeriodFollowing -> Period - C.ParenFollowing -> Paren - in Numbered dec i +-- A dummy instance just to satisfy commonmark; we don't use this. +instance C.HasAttributes Inlines where + addAttributes _ = id --- | Remove hyperlinks from an inline sequence. This should only be used --- for sequences that are themselves used as labels for hyperlinks; this --- prevents them from embedding their own hyperlinks, which is nonsense. --- --- Any hyperlinks found in the sequence will be replaced with a text --- represent of their URL (if they have no label) or the label itself --- otherwise. -removeHyperlinks :: Seq C.Inline -> Seq C.Inline -removeHyperlinks is = - case Seq.viewl is of - h :< t -> - case h of - C.Link label theUrl _ -> - if Seq.null label - then C.Str theUrl <| removeHyperlinks t - else removeHyperlinks label <> removeHyperlinks t - _ -> h <| removeHyperlinks t - Seq.EmptyL -> mempty +instance C.IsInline Inlines where + lineBreak = singleI ELineBreak + softBreak = singleI ESoftBreak + str t = Inlines $ Seq.fromList $ + filter (/= (EText "")) $ + intersperse ESpace $ EText <$> T.splitOn " " t + entity = singleI . EText + escapedChar = singleI . EText . T.singleton + emph = singleI . EEmph + strong = singleI . EStrong + link url _title desc = singleI $ EHyperlink (URL url) desc + image url _title desc = singleI $ EImage (URL url) desc + code t = singleI $ ECode $ C.str t + rawInline _ = singleI . ERawHtml --- | Convert a sequence of Markdown inline values to a sequence of --- Elements. --- --- This conversion converts sequences of Markdown AST fragments into --- RichText elements. In particular, this function may determine that --- some sequences of Markdown text fragments belong together, such as --- the sequence @["@", "joe", "-", "user"]@, which should be treated as --- a single "@joe-user" token due to username character validation. When --- appropriate, this function does such consolidation when converting to --- RichText elements. --- --- This function is also partially responsible for paving the way for --- line-wrapping later on when RichText is rendered. This means that, --- when possible, the elements produced by this function need to be as --- small as possible, without losing structure information. An example --- of this is Markdown inline code fragments, such as "`this is code`". --- This function will convert that one Markdown inline code fragment --- into a sequence of five RichText elements, each with a "Code" style --- assigned: @[EText "this", ESpace, EText "is", ESpace, EText "code"]@. --- This "flattening" of the original Markdown structure makes it much --- easier to do line-wrapping without losing style information because --- it is possible to gather up tokens that do not exceed line widths --- without losing style information. This is key to rendering the text --- with the right terminal attributes. +instance C.HasStrikethrough Inlines where + strikethrough = singleI . EStrikethrough + +-- Syntax extension for parsing ~channel references. +channelSpec :: (Monad m) => C.SyntaxSpec m Inlines Blocks +channelSpec = + mempty { C.syntaxInlineParsers = [C.withAttributes parseChannel] + } + +parseChannel :: (Monad m) => C.InlineParser m Inlines +parseChannel = P.try $ do + void $ C.symbol normalChannelSigilChar + let chunk = C.satisfyWord (const True) <|> C.symbol '_' <|> C.symbol '-' + cts <- P.many1 chunk + return $ singleI $ EChannel $ C.untokenize cts + +-- Syntax extension for parsing @username references. +usernameSpec :: (Monad m) => C.SyntaxSpec m Inlines Blocks +usernameSpec = + mempty { C.syntaxInlineParsers = [C.withAttributes parseUsername] + } + +parseUsername :: (Monad m) => C.InlineParser m Inlines +parseUsername = P.try $ do + void $ C.symbol userSigilChar + let chunk = C.satisfyWord (const True) <|> C.symbol '_' <|> C.symbol '-' + [period] = C.tokenize "" "." + uts <- intersperse period <$> P.sepBy1 chunk (C.symbol '.') + return $ singleI $ EUser $ C.untokenize uts + +-- Syntax extension for parsing :emoji: references. -- --- However, there are a couple of cases where such flattening does *not* --- happen: hyperlinks and images. In these cases we do not flatten the --- (arbitrary) text label structure of links and images because we need --- to be able to recover those labels to gather up URLs to show to the --- user in the URL list. So we leave the complete text structure of --- those labels behind in the 'EHyperlink' and 'EImage' constructors as --- sequences of Elements. This means that logic in 'Draw.RichText' that --- does line-wrapping will have to explicitly break up link and image --- labels across line breaks. -fromMarkdownInlines :: Maybe TeamBaseURL -> Seq C.Inline -> Seq Element -fromMarkdownInlines baseUrl inlines = - let go sty is = case Seq.viewl is of - C.Str "~" :< xs -> - case Seq.viewl xs of - C.Str "~" :< xs2 -> - case takeUntilStrikethroughEnd xs2 of - Nothing -> Element sty (EText "~") <| - go sty xs - Just (strikethroughInlines, rest) -> - go Strikethrough strikethroughInlines <> - go sty rest - _ -> - let (cFrags, rest) = Seq.spanl isNameFragment xs - cn = T.concat (unsafeGetStr <$> F.toList cFrags) - in if not (T.null cn) - then Element sty (EChannel cn) <| go sty rest - else Element sty (EText normalChannelSigil) <| go sty xs - C.Str ":" :< xs -> - let validEmojiFragment (C.Str f) = - f `elem` ["_", "-"] || T.all isAlphaNum f - validEmojiFragment _ = False - (emojiFrags, rest) = Seq.spanl validEmojiFragment xs - em = T.concat $ unsafeGetStr <$> F.toList emojiFrags - in case Seq.viewl rest of - C.Str ":" :< rest2 -> - Element Normal (EEmoji em) <| go sty rest2 - _ -> - Element sty (EText ":") <| go sty xs - C.Str t :< xs | userSigil `T.isPrefixOf` t -> - let (uFrags, rest) = Seq.spanl isNameFragment xs - t' = T.concat $ t : (unsafeGetStr <$> F.toList uFrags) - u = T.drop 1 t' - in Element sty (EUser u) <| go sty rest - C.Str t :< xs -> - -- When we encounter a string node, we go ahead and - -- process the rest of the nodes in the sequence. If the - -- new sequence starts with *another* string node with - -- the same style, we merge them. We do this because - -- Cheapskate will parse things like punctuation as - -- individual string nodes, but we want to keep those - -- together with any text is adjacent to them to avoid - -- e.g. breaking up quotes from quoted text when doing - -- line-wrapping. It's important to make sure we only do - -- this for adjacent string (i.e. not whitespace) nodes - -- and that we make sure we only merge when they have the - -- same style. - let rest = go sty xs - e = Element sty (EText t) - in case Seq.viewl rest of - Element sty2 (EText t2) :< tail_ | sty2 == sty -> - (Element sty (EText (t <> t2))) <| tail_ - _ -> - e <| rest - C.Space :< xs -> - Element sty ESpace <| go sty xs - C.SoftBreak :< xs -> - Element sty ESoftBreak <| go sty xs - C.LineBreak :< xs -> - Element sty ELineBreak <| go sty xs - C.Link label theUrl _ :< xs -> - let mLabel = if Seq.null label - then Nothing - else case F.toList label of - [C.Str u] | u == theUrl -> Nothing - _ -> Just $ fromMarkdownInlines baseUrl $ removeHyperlinks label - rest = go sty xs - this = case flip getPermalink theUrl =<< baseUrl of - Nothing -> - let url = URL theUrl - in Element (Hyperlink url sty) $ EHyperlink url mLabel - Just (tName, pId) -> - Element Permalink $ EPermalink tName pId mLabel - in this <| rest - C.Image altIs theUrl _ :< xs -> - let mLabel = if Seq.null altIs - then Nothing - else Just $ fromMarkdownInlines baseUrl altIs - url = URL theUrl - in (Element (Hyperlink url sty) $ EImage url mLabel) <| go sty xs - C.RawHtml t :< xs -> - Element sty (ERawHtml t) <| go sty xs - C.Code t :< xs -> - -- We turn a single code string into individual Elements - -- so we can perform line-wrapping on the inline code - -- text. - let ts = [ Element Code frag - | wd <- T.split (== ' ') t - , frag <- case wd of - "" -> [ESpace] - _ -> [ESpace, EText wd] - ] - ts' = case ts of - (Element _ ESpace:rs) -> rs - _ -> ts - in Seq.fromList ts' <> go sty xs - C.Emph as :< xs -> - go Emph as <> go sty xs - C.Strong as :< xs -> - go Strong as <> go sty xs - C.Entity t :< xs -> - Element sty (EText t) <| go sty xs - Seq.EmptyL -> mempty +-- NOTE: the commonmark-extensions package also provides a syntax +-- extension for exactly this. Why don't we use it? I'm glad you asked. +-- We don't use it because that extension actually checks to see whether +-- emoji are valid by looking in a database (provided by the 'emojis' +-- package). While that's actually a great feature, it is problematic +-- when that package's emoji database does not exactly match the one +-- that the Mattermost server uses. As a result, Matterhorn may think +-- that some valid emoji (according to the server) is invalid (according +-- to the 'emojis' package). Instead of using that extension, we made +-- our own that does *not* validate the emoji references at parse time. +-- We just parse them and keep them around, and then validate them at +-- *render* time. That way we can allow anything to parse, but change +-- how we render valid and invalid emoji based on a copy of the server's +-- emoji database that we bundle with Matterhorn. +emojiSpec :: (Monad m) => C.SyntaxSpec m Inlines Blocks +emojiSpec = + mempty { C.syntaxInlineParsers = [C.withAttributes parseEmoji] + } - in go Normal inlines +parseEmoji :: (Monad m) => C.InlineParser m Inlines +parseEmoji = P.try $ do + void $ C.symbol ':' + ts <- P.many1 $ C.satisfyWord (const True) + <|> C.symbol '_' + <|> C.symbol '+' + <|> C.symbol '-' + void $ C.symbol ':' + let kw = C.untokenize ts + return $ singleI $ EEmoji kw -takeUntilStrikethroughEnd :: Seq C.Inline -> Maybe (Seq C.Inline, Seq C.Inline) -takeUntilStrikethroughEnd is = - let go pos s = case Seq.viewl s of - C.Str "~" :< rest -> - case Seq.viewl rest of - C.Str "~" :< _ -> - Just pos - _ -> go (pos + 1) rest - _ :< rest -> go (pos + 1) rest - Seq.EmptyL -> Nothing - in do - pos <- go 0 is - let (h, t) = Seq.splitAt pos is - return (h, Seq.drop 2 t) +-- A dummy instance just to satisfy commonmark; we don't use this. +instance C.HasAttributes Blocks where + addAttributes _ = id +-- A dummy instance just to satisfy commonmark; we don't use this. +instance C.Rangeable Blocks where + ranged _ = id + +instance C.IsBlock Inlines Blocks where + paragraph = singleB . Para + plain = singleB . Para + thematicBreak = singleB HRule + blockQuote = singleB . Blockquote + codeBlock infoTxt content = singleB $ CodeBlock (parseCodeBlockInfo infoTxt) content + heading level i = singleB $ Header level i + rawBlock _format content = singleB $ CodeBlock (parseCodeBlockInfo "") content + list ty spacing bs = singleB $ List ty spacing $ Seq.fromList bs + referenceLinkDefinition _label (_dest, _title) = mempty + +parseCodeBlockInfo :: Text -> CodeBlockInfo +parseCodeBlockInfo t = CodeBlockInfo lang info + where + ws = T.words t + (lang, info) = case ws of + [l, i] -> (Just l, Just i) + [l] -> (Just l, Nothing) + _ -> (Nothing, Nothing) + +-- | Parse markdown input text to RichText. +-- +-- Note that this always returns a block sequence even if the input +-- cannot be parsed. It isn't yet clear just how permissive the +-- commonmark parser is, but so far we have not encountered any issues. +-- If the input document is so broken that commonmark cannot parse it, +-- we return an empty block sequence. +parseMarkdown :: Maybe TeamBaseURL + -- ^ If provided, perform post link detection whenever a + -- hyperlink is parsed by checking to see if the post link + -- is a post in this Mattermost team + -> T.Text + -- ^ The markdown input text to parse + -> Blocks +parseMarkdown mBaseUrl t = + let customSyntax = mconcat $ markdownExtensions <> [C.defaultSyntaxSpec] + markdownExtensions = + [ C.autolinkSpec + , C.strikethroughSpec + , usernameSpec + , channelSpec + , emojiSpec + ] + + in case runIdentity $ C.commonmarkWith customSyntax "-" t of + Left _ -> mempty + Right bs -> case mBaseUrl of + Nothing -> bs + Just baseUrl -> rewriteBlocksPermalinks baseUrl bs + -- | If the specified URL matches the active server base URL and team -- and refers to a post, extract the team name and post ID values and -- return them. @@ -419,20 +371,68 @@ then Just (tName, PI $ Id pIdStr) else Nothing +-- | Locate post hyperlinks in the block sequence and rewrite them as +-- post permalinks. +rewriteBlocksPermalinks :: TeamBaseURL -> Blocks -> Blocks +rewriteBlocksPermalinks u (Blocks bs) = Blocks $ rewriteBlockPermalinks u <$> bs -unsafeGetStr :: C.Inline -> Text -unsafeGetStr (C.Str t) = t -unsafeGetStr _ = error "BUG: unsafeGetStr called on non-Str Inline" +-- | Locate post hyperlinks in the block and rewrite them as post +-- permalinks. +rewriteBlockPermalinks :: TeamBaseURL -> Block -> Block +rewriteBlockPermalinks u (Para s) = Para $ rewriteInlinePermalinks u s +rewriteBlockPermalinks u (Header i s) = Header i $ rewriteInlinePermalinks u s +rewriteBlockPermalinks u (Blockquote bs) = Blockquote $ rewriteBlocksPermalinks u bs +rewriteBlockPermalinks u (List ty spacing bss) = List ty spacing $ rewriteBlocksPermalinks u <$> bss +rewriteBlockPermalinks _ b@(CodeBlock {}) = b +rewriteBlockPermalinks _ b@(HTMLBlock {}) = b +rewriteBlockPermalinks _ b@HRule = b --- | Obtain all username references in a sequence of rich text blocks. -findUsernames :: Seq RichTextBlock -> S.Set T.Text -findUsernames = S.unions . F.toList . fmap blockFindUsernames +-- | Locate post hyperlinks in the inline sequence and rewrite them as +-- post permalinks. +rewriteInlinePermalinks :: TeamBaseURL -> Inlines -> Inlines +rewriteInlinePermalinks u (Inlines is) = Inlines $ rewriteInlinePermalink u <$> is -blockFindUsernames :: RichTextBlock -> S.Set T.Text +-- | Locate post hyperlinks in the inline value and rewrite them as post +-- permalinks. +rewriteInlinePermalink :: TeamBaseURL -> Inline -> Inline +rewriteInlinePermalink u i@(EHyperlink url label) = + case getPermalink u (unURL url) of + Nothing -> i + Just (tName, pId) -> + -- Get rid of permalink labels if they just match the URL, + -- because that's how Commonmark-extensions parses them. We + -- would rather only preserve the label if it differs from + -- the URL. + let newLabel = if label == Inlines (Seq.fromList [EText $ unURL url]) + then Nothing + else Just label + in EPermalink tName pId newLabel +rewriteInlinePermalink u (EEmph s) = EEmph $ rewriteInlinePermalinks u s +rewriteInlinePermalink u (ECode s) = ECode $ rewriteInlinePermalinks u s +rewriteInlinePermalink u (EStrikethrough s) = EStrikethrough $ rewriteInlinePermalinks u s +rewriteInlinePermalink u (EStrong s) = EStrong $ rewriteInlinePermalinks u s +rewriteInlinePermalink u (ENonBreaking s) = ENonBreaking $ rewriteInlinePermalinks u s +rewriteInlinePermalink _ i@(EText {}) = i +rewriteInlinePermalink _ i@ESpace = i +rewriteInlinePermalink _ i@ESoftBreak = i +rewriteInlinePermalink _ i@ELineBreak = i +rewriteInlinePermalink _ i@(EEditSentinel {}) = i +rewriteInlinePermalink _ i@(ERawHtml {}) = i +rewriteInlinePermalink _ i@(EEmoji {}) = i +rewriteInlinePermalink _ i@(EUser {}) = i +rewriteInlinePermalink _ i@(EChannel {}) = i +rewriteInlinePermalink _ i@(EImage {}) = i +rewriteInlinePermalink _ i@(EPermalink {}) = i + +-- | Obtain all username references in a rich text document. +findUsernames :: Blocks -> S.Set T.Text +findUsernames (Blocks bs) = S.unions $ F.toList $ fmap blockFindUsernames bs + +blockFindUsernames :: Block -> S.Set T.Text blockFindUsernames (Para is) = - elementFindUsernames $ F.toList is + inlineFindUsernames $ F.toList $ unInlines is blockFindUsernames (Header _ is) = - elementFindUsernames $ F.toList is + inlineFindUsernames $ F.toList $ unInlines is blockFindUsernames (Blockquote bs) = findUsernames bs blockFindUsernames (List _ _ bs) = @@ -440,47 +440,39 @@ blockFindUsernames _ = mempty -elementFindUsernames :: [Element] -> S.Set T.Text -elementFindUsernames [] = mempty -elementFindUsernames (e : es) = - case eData e of - EUser u -> S.insert u $ elementFindUsernames es - _ -> elementFindUsernames es +inlineFindUsernames :: [Inline] -> S.Set T.Text +inlineFindUsernames [] = mempty +inlineFindUsernames (i : is) = + case i of + EUser u -> S.insert u $ inlineFindUsernames is + _ -> inlineFindUsernames is -- | Obtain all URLs (and optional labels) in a rich text block. -blockGetURLs :: RichTextBlock -> [(Either (TeamURLName, PostId) URL, Maybe (Seq Element))] +blockGetURLs :: Block -> [(Either (TeamURLName, PostId) URL, Maybe Inlines)] blockGetURLs (Para is) = - catMaybes $ elementGetURL <$> toList is + catMaybes $ elementGetURL <$> (toList $ unInlines is) blockGetURLs (Header _ is) = - catMaybes $ elementGetURL <$> toList is + catMaybes $ elementGetURL <$> (toList $ unInlines is) blockGetURLs (Blockquote bs) = - mconcat $ blockGetURLs <$> toList bs + mconcat $ blockGetURLs <$> toList (unBlocks bs) blockGetURLs (List _ _ bss) = mconcat $ mconcat $ - (fmap blockGetURLs . F.toList) <$> F.toList bss + (fmap blockGetURLs . F.toList . unBlocks) <$> F.toList bss blockGetURLs _ = mempty -elementGetURL :: Element -> Maybe (Either (TeamURLName, PostId) URL, Maybe (Seq Element)) -elementGetURL (Element _ (EHyperlink url label)) = - Just (Right url, label) -elementGetURL (Element _ (EImage url label)) = - Just (Right url, label) -elementGetURL (Element _ (EPermalink tName pId label)) = +elementGetURL :: Inline -> Maybe (Either (TeamURLName, PostId) URL, Maybe Inlines) +elementGetURL (EHyperlink url label) = + Just (Right url, Just label) +elementGetURL (EImage url label) = + Just (Right url, Just label) +elementGetURL (EPermalink tName pId label) = Just (Left (tName, pId), label) elementGetURL _ = Nothing -- | Find the first code block in a sequence of rich text blocks. -findVerbatimChunk :: Seq RichTextBlock -> Maybe Text -findVerbatimChunk = getFirst . F.foldMap go +findVerbatimChunk :: Blocks -> Maybe Text +findVerbatimChunk (Blocks bs) = getFirst $ F.foldMap go bs where go (CodeBlock _ t) = First (Just t) go _ = First Nothing - -isValidNameChar :: Char -> Bool -isValidNameChar c = isAlpha c || c == '_' || c == '.' || c == '-' - -isNameFragment :: C.Inline -> Bool -isNameFragment (C.Str t) = - not (T.null t) && isValidNameChar (T.head t) -isNameFragment _ = False diff --git a/src/Matterhorn/Windows/ViewMessage.hs b/src/Matterhorn/Windows/ViewMessage.hs --- a/src/Matterhorn/Windows/ViewMessage.hs +++ b/src/Matterhorn/Windows/ViewMessage.hs @@ -21,39 +21,41 @@ import qualified Graphics.Vty as Vty import Lens.Micro.Platform ( to ) +import Network.Mattermost.Types ( TeamId ) + import Matterhorn.Constants import Matterhorn.Events.Keybindings import Matterhorn.Themes import Matterhorn.Types import Matterhorn.Draw.RichText -import Matterhorn.Draw.Messages ( nameForUserRef ) +import Matterhorn.Draw.Messages ( renderMessage, MessageData(..), nameForUserRef ) -- | The template for "View Message" windows triggered by message -- selection mode. -viewMessageWindowTemplate :: TabbedWindowTemplate ViewMessageWindowTab -viewMessageWindowTemplate = - TabbedWindowTemplate { twtEntries = [ messageEntry - , reactionsEntry +viewMessageWindowTemplate :: TeamId -> TabbedWindowTemplate ViewMessageWindowTab +viewMessageWindowTemplate tId = + TabbedWindowTemplate { twtEntries = [ messageEntry tId + , reactionsEntry tId ] , twtTitle = const $ txt "View Message" } -messageEntry :: TabbedWindowEntry ViewMessageWindowTab -messageEntry = +messageEntry :: TeamId -> TabbedWindowEntry ViewMessageWindowTab +messageEntry tId = TabbedWindowEntry { tweValue = VMTabMessage , tweRender = renderTab , tweHandleEvent = handleEvent , tweTitle = tabTitle - , tweShowHandler = onShow + , tweShowHandler = onShow tId } -reactionsEntry :: TabbedWindowEntry ViewMessageWindowTab -reactionsEntry = +reactionsEntry :: TeamId -> TabbedWindowEntry ViewMessageWindowTab +reactionsEntry tId = TabbedWindowEntry { tweValue = VMTabReactions , tweRender = renderTab , tweHandleEvent = handleEvent , tweTitle = tabTitle - , tweShowHandler = onShow + , tweShowHandler = onShow tId } tabTitle :: ViewMessageWindowTab -> Bool -> T.Text @@ -65,9 +67,9 @@ -- window used the same handle for the viewport and we don't want that -- old state affecting this window. This also means that switching tabs -- in an existing window resets this state, too. -onShow :: ViewMessageWindowTab -> MH () -onShow VMTabMessage = resetVp ViewMessageArea -onShow VMTabReactions = resetVp ViewMessageArea +onShow :: TeamId -> ViewMessageWindowTab -> MH () +onShow tId VMTabMessage = resetVp $ ViewMessageArea tId +onShow tId VMTabReactions = resetVp $ ViewMessageArea tId resetVp :: Name -> MH () resetVp n = do @@ -78,7 +80,7 @@ renderTab :: ViewMessageWindowTab -> ChatState -> Widget Name renderTab tab cs = - let latestMessage = case cs^.csViewedMessage of + let latestMessage = case cs^.csCurrentTeam.tsViewedMessage of Nothing -> error "BUG: no message to show, please report!" Just (m, _) -> getLatestMessage cs m in case tab of @@ -98,8 +100,9 @@ void . handleKeyboardEvent viewMessageReactionsKeybindings (const $ return ()) reactionsText :: ChatState -> Message -> Widget Name -reactionsText st m = viewport ViewMessageReactionsArea Vertical body +reactionsText st m = viewport (ViewMessageReactionsArea tId) Vertical body where + tId = st^.csCurrentTeamId body = case null reacList of True -> txt "This message has no reactions." False -> vBox $ mkEntry <$> reacList @@ -125,6 +128,7 @@ viewMessageBox st msg = let maybeWarn = if not (msg^.mDeleted) then id else warn warn w = vBox [w, hBorder, deleteWarning] + tId = st^.csCurrentTeamId deleteWarning = withDefAttr errorMessageAttr $ txtWrap $ "Alert: this message has been deleted and " <> "will no longer be accessible once this window " <> @@ -153,43 +157,53 @@ in Widget Greedy Greedy $ do ctx <- getContext - render $ maybeWarn $ viewport ViewMessageArea Both $ mkBody (ctx^.availWidthL) + render $ maybeWarn $ viewport (ViewMessageArea tId) Both $ mkBody (ctx^.availWidthL) viewMessageKeybindings :: KeyConfig -> KeyHandlerMap viewMessageKeybindings = mkKeybindings viewMessageKeyHandlers viewMessageKeyHandlers :: [KeyEventHandler] viewMessageKeyHandlers = - let vs = viewportScroll ViewMessageArea - in [ mkKb PageUpEvent "Page up" $ - mh $ vScrollBy vs (-1 * pageAmount) + let vs = viewportScroll . ViewMessageArea + in [ mkKb PageUpEvent "Page up" $ do + tId <- use csCurrentTeamId + mh $ vScrollBy (vs tId) (-1 * pageAmount) - , mkKb PageDownEvent "Page down" $ - mh $ vScrollBy vs pageAmount + , mkKb PageDownEvent "Page down" $ do + tId <- use csCurrentTeamId + mh $ vScrollBy (vs tId) pageAmount - , mkKb PageLeftEvent "Page left" $ - mh $ hScrollBy vs (-2 * pageAmount) + , mkKb PageLeftEvent "Page left" $ do + tId <- use csCurrentTeamId + mh $ hScrollBy (vs tId) (-2 * pageAmount) - , mkKb PageRightEvent "Page right" $ - mh $ hScrollBy vs (2 * pageAmount) + , mkKb PageRightEvent "Page right" $ do + tId <- use csCurrentTeamId + mh $ hScrollBy (vs tId) (2 * pageAmount) - , mkKb ScrollUpEvent "Scroll up" $ - mh $ vScrollBy vs (-1) + , mkKb ScrollUpEvent "Scroll up" $ do + tId <- use csCurrentTeamId + mh $ vScrollBy (vs tId) (-1) - , mkKb ScrollDownEvent "Scroll down" $ - mh $ vScrollBy vs 1 + , mkKb ScrollDownEvent "Scroll down" $ do + tId <- use csCurrentTeamId + mh $ vScrollBy (vs tId) 1 - , mkKb ScrollLeftEvent "Scroll left" $ - mh $ hScrollBy vs (-1) + , mkKb ScrollLeftEvent "Scroll left" $ do + tId <- use csCurrentTeamId + mh $ hScrollBy (vs tId) (-1) - , mkKb ScrollRightEvent "Scroll right" $ - mh $ hScrollBy vs 1 + , mkKb ScrollRightEvent "Scroll right" $ do + tId <- use csCurrentTeamId + mh $ hScrollBy (vs tId) 1 - , mkKb ScrollBottomEvent "Scroll to the end of the message" $ - mh $ vScrollToEnd vs + , mkKb ScrollBottomEvent "Scroll to the end of the message" $ do + tId <- use csCurrentTeamId + mh $ vScrollToEnd (vs tId) - , mkKb ScrollTopEvent "Scroll to the beginning of the message" $ - mh $ vScrollToBeginning vs + , mkKb ScrollTopEvent "Scroll to the beginning of the message" $ do + tId <- use csCurrentTeamId + mh $ vScrollToBeginning (vs tId) ] viewMessageReactionsKeybindings :: KeyConfig -> KeyHandlerMap @@ -197,22 +211,28 @@ viewMessageReactionsKeyHandlers :: [KeyEventHandler] viewMessageReactionsKeyHandlers = - let vs = viewportScroll ViewMessageReactionsArea - in [ mkKb PageUpEvent "Page up" $ - mh $ vScrollBy vs (-1 * pageAmount) + let vs = viewportScroll . ViewMessageReactionsArea + in [ mkKb PageUpEvent "Page up" $ do + tId <- use csCurrentTeamId + mh $ vScrollBy (vs tId) (-1 * pageAmount) - , mkKb PageDownEvent "Page down" $ - mh $ vScrollBy vs pageAmount + , mkKb PageDownEvent "Page down" $ do + tId <- use csCurrentTeamId + mh $ vScrollBy (vs tId) pageAmount - , mkKb ScrollUpEvent "Scroll up" $ - mh $ vScrollBy vs (-1) + , mkKb ScrollUpEvent "Scroll up" $ do + tId <- use csCurrentTeamId + mh $ vScrollBy (vs tId) (-1) - , mkKb ScrollDownEvent "Scroll down" $ - mh $ vScrollBy vs 1 + , mkKb ScrollDownEvent "Scroll down" $ do + tId <- use csCurrentTeamId + mh $ vScrollBy (vs tId) 1 - , mkKb ScrollBottomEvent "Scroll to the end of the reactions list" $ - mh $ vScrollToEnd vs + , mkKb ScrollBottomEvent "Scroll to the end of the reactions list" $ do + tId <- use csCurrentTeamId + mh $ vScrollToEnd (vs tId) - , mkKb ScrollTopEvent "Scroll to the beginning of the reactions list" $ - mh $ vScrollToBeginning vs + , mkKb ScrollTopEvent "Scroll to the beginning of the reactions list" $ do + tId <- use csCurrentTeamId + mh $ vScrollToBeginning (vs tId) ] diff --git a/syntax/abc.xml b/syntax/abc.xml --- a/syntax/abc.xml +++ b/syntax/abc.xml @@ -2,7 +2,7 @@ - + @@ -38,7 +38,10 @@ - + + + + @@ -79,8 +82,9 @@ - + + diff --git a/syntax/actionscript.xml b/syntax/actionscript.xml --- a/syntax/actionscript.xml +++ b/syntax/actionscript.xml @@ -1,6 +1,6 @@ - + @@ -247,6 +247,8 @@ + + @@ -266,12 +268,14 @@ - - - - + + + + + + @@ -293,15 +297,16 @@ - - - - - + + + + + - + + @@ -329,8 +334,9 @@ - + + diff --git a/syntax/ada.xml b/syntax/ada.xml --- a/syntax/ada.xml +++ b/syntax/ada.xml @@ -1,7 +1,7 @@ - + + + + @@ -193,7 +196,7 @@ - + diff --git a/syntax/agda.xml b/syntax/agda.xml --- a/syntax/agda.xml +++ b/syntax/agda.xml @@ -1,9 +1,9 @@ - + ]> - + abstract @@ -56,14 +56,14 @@ - - - + + + - + @@ -73,11 +73,16 @@ cases are already taken care off above) --> - - - - + + + + + + + + + @@ -107,11 +112,12 @@ - - + + + diff --git a/syntax/apache.xml b/syntax/apache.xml --- a/syntax/apache.xml +++ b/syntax/apache.xml @@ -13,7 +13,7 @@ --> @@ -585,6 +585,7 @@ + @@ -631,3 +632,4 @@ + diff --git a/syntax/asn1.xml b/syntax/asn1.xml --- a/syntax/asn1.xml +++ b/syntax/asn1.xml @@ -13,7 +13,7 @@ You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php --> - + DEFINITIONS @@ -54,6 +54,8 @@ + + @@ -64,6 +66,11 @@ + + + + + diff --git a/syntax/ats.xml b/syntax/ats.xml --- a/syntax/ats.xml +++ b/syntax/ats.xml @@ -1,165 +1,165 @@ - + + ]> - + - abstype - abst0ype - absprop - absview - absvtype - absviewtype - absvt0ype - absviewt0ype - and - as - assume - begin - break - case - continue - classdec - datasort - datatype - dataprop - dataview - datavtype - dataviewtype - do - dynload - else - end - exception - extern - extype - extval - if - in - infix - infixl - infixr - prefix - postfix - let - local - macdef - macrodef - nonfix - overload - of - op - rec - scase - sif - sortdef - sta - stacst - stadef - stavar - staload - symelim - symintr - then - try - tkindef - type - typedef - propdef - viewdef - vtypedef - viewtypedef - val - prval - var - prvar - when - where - for - while - with - withtype - withprop - withview - withvtype - withviewtype + abstype + abst0ype + absprop + absview + absvtype + absviewtype + absvt0ype + absviewt0ype + and + as + assume + begin + break + case + continue + classdec + datasort + datatype + dataprop + dataview + datavtype + dataviewtype + do + dynload + else + end + exception + extern + extype + extval + if + in + infix + infixl + infixr + prefix + postfix + let + local + macdef + macrodef + nonfix + overload + of + op + rec + scase + sif + sortdef + sta + stacst + stadef + stavar + staload + symelim + symintr + then + try + tkindef + type + typedef + propdef + viewdef + vtypedef + viewtypedef + val + prval + var + prvar + when + where + for + while + with + withtype + withprop + withview + withvtype + withviewtype - $arrpsz - $arrptrsize - $delay - $ldelay - $effmask - $effmask_ntm - $effmask_exn - $effmask_ref - $effmask_wrt - $effmask_all - $extern - $extkind - $extype - $extype_struct - $extval - $lst - $lst_t - $lst_vt - $list - $list_t - $list_vt - $rec - $rec_t - $rec_vt - $record - $record_t - $record_vt - $tup - $tup_t - $tup_vt - $tuple - $tuple_t - $tuple_vt - $raise - $showtype - $myfilename - $mylocation - $myfunction - #assert - #define - #elif - #elifdef - #elifndef - #else - #endif - #error - #if - #ifdef - #ifndef - #include - #print - #then - #undef + $arrpsz + $arrptrsize + $delay + $ldelay + $effmask + $effmask_ntm + $effmask_exn + $effmask_ref + $effmask_wrt + $effmask_all + $extern + $extkind + $extype + $extype_struct + $extval + $lst + $lst_t + $lst_vt + $list + $list_t + $list_vt + $rec + $rec_t + $rec_vt + $record + $record_t + $record_vt + $tup + $tup_t + $tup_vt + $tuple + $tuple_t + $tuple_vt + $raise + $showtype + $myfilename + $mylocation + $myfunction + #assert + #define + #elif + #elifdef + #elifndef + #else + #endif + #error + #if + #ifdef + #ifndef + #include + #print + #then + #undef - fn - fnx - fun - prfn - prfun - praxi - castfn - implmnt - implement - primplmnt - primplement - lam - llam - fix + fn + fnx + fun + prfn + prfun + praxi + castfn + implmnt + implement + primplmnt + primplement + lam + llam + fix @@ -190,28 +190,27 @@ + + + + - - - - - - - - + + + - - - - + + + + @@ -236,8 +235,6 @@ - - @@ -247,9 +244,7 @@ - - - + diff --git a/syntax/awk.xml b/syntax/awk.xml --- a/syntax/awk.xml +++ b/syntax/awk.xml @@ -1,6 +1,6 @@ - @@ -134,128 +134,129 @@ xdigit - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - + + @@ -286,3 +287,4 @@ + diff --git a/syntax/bash.xml b/syntax/bash.xml --- a/syntax/bash.xml +++ b/syntax/bash.xml @@ -7,8 +7,9 @@ + ]> - + + + + @@ -482,8 +486,14 @@ - + + + + + + @@ -492,7 +502,7 @@ - + @@ -502,7 +512,7 @@ - + @@ -553,7 +563,8 @@ - + + @@ -567,13 +578,27 @@ - + - + + + + + + + + + + + + + + @@ -582,10 +607,11 @@ - + + - + diff --git a/syntax/boo.xml b/syntax/boo.xml --- a/syntax/boo.xml +++ b/syntax/boo.xml @@ -2,7 +2,7 @@ - + import @@ -163,13 +163,15 @@ - - + + - - + + + + - + @@ -185,7 +187,7 @@ - + @@ -199,11 +201,13 @@ + + @@ -236,6 +240,8 @@ + + @@ -265,6 +271,11 @@ + + + + + @@ -293,8 +304,8 @@ - - + + @@ -302,3 +313,4 @@ + diff --git a/syntax/c.xml b/syntax/c.xml --- a/syntax/c.xml +++ b/syntax/c.xml @@ -1,8 +1,8 @@ - + + @@ -10,7 +10,7 @@ ]> - + - - @@ -137,9 +135,7 @@ - - - + @@ -149,17 +145,32 @@ + + + + + + + + + + + + + + + @@ -187,27 +198,19 @@ - - - + - - - - - - - + @@ -218,24 +221,22 @@ - - - + - + - - - - + + + + @@ -280,8 +281,9 @@ - + + diff --git a/syntax/clojure.xml b/syntax/clojure.xml --- a/syntax/clojure.xml +++ b/syntax/clojure.xml @@ -22,7 +22,7 @@ * Boston, MA 02110-1301, USA. * ********************************************************************** --> - + def @@ -741,13 +741,14 @@ - + - + - + + @@ -859,19 +860,18 @@ - - + - - - + + + @@ -881,3 +881,4 @@ + diff --git a/syntax/cmake.xml b/syntax/cmake.xml --- a/syntax/cmake.xml +++ b/syntax/cmake.xml @@ -4,35 +4,20 @@ ]> break cmake_host_system_information + cmake_language cmake_minimum_required cmake_parse_arguments cmake_policy @@ -185,6 +171,11 @@ TOTAL_PHYSICAL_MEMORY TOTAL_VIRTUAL_MEMORY + + CALL + CODE + EVAL + FATAL_ERROR VERSION @@ -218,6 +209,7 @@ AND + COMMAND DEFINED EQUAL EXISTS @@ -250,6 +242,8 @@ COMMAND COMMAND_ECHO + ECHO_ERROR_VARIABLE + ECHO_OUTPUT_VARIABLE ENCODING ERROR_FILE ERROR_QUIET @@ -275,8 +269,12 @@ UTF8 + @ONLY APPEND + ARCHIVE_CREATE + ARCHIVE_EXTRACT CONDITION + CONFIGURE CONFIGURE_DEPENDS CONTENT COPY @@ -285,13 +283,16 @@ DIRECTORY_PERMISSIONS DOWNLOAD ENCODING + ESCAPE_QUOTES EXCLUDE EXPECTED_HASH EXPECTED_MD5 + FILES FILES_MATCHING FILE_PERMISSIONS FOLLOW_SYMLINKS FOLLOW_SYMLINK_CHAIN + FORMAT GENERATE GET_RUNTIME_DEPENDENCIES GLOB @@ -309,13 +310,16 @@ LIMIT_INPUT LIMIT_OUTPUT LIST_DIRECTORIES + LIST_ONLY LOCK LOG MAKE_DIRECTORY MD5 + MTIME NETRC NETRC_FILE NEWLINE_CONSUME + NEWLINE_STYLE NO_HEX_CONVERSION NO_SOURCE_PERMISSIONS OFFSET @@ -353,19 +357,28 @@ TOUCH_NOCREATE TO_CMAKE_PATH TO_NATIVE_PATH + TYPE UPLOAD USERPWD USE_SOURCE_PERMISSIONS UTC + VERBOSE WRITE + 7zip + BZip2 + CRLF + DOS FILE FUNCTION GROUP_EXECUTE GROUP_READ GROUP_WRITE + GZip IGNORED + LF + None OPTIONAL OWNER_EXECUTE OWNER_READ @@ -374,14 +387,23 @@ REQUIRED SETGID SETUID + UNIX UTF-16BE UTF-16LE UTF-32B UTF-32LE UTF-8 + WIN32 WORLD_EXECUTE WORLD_READ WORLD_WRITE + XZ + Zstd + gnutar + pax + paxr + raw + zip CMAKE_FIND_ROOT_PATH_BOTH @@ -398,6 +420,7 @@ ONLY_CMAKE_FIND_ROOT_PATH PATHS PATH_SUFFIXES + REQUIRED CMAKE_FIND_ROOT_PATH_BOTH @@ -415,6 +438,7 @@ ONLY_CMAKE_FIND_ROOT_PATH PATHS PATH_SUFFIXES + REQUIRED CMAKE_FIND_ROOT_PATH_BOTH @@ -458,6 +482,7 @@ ONLY_CMAKE_FIND_ROOT_PATH PATHS PATH_SUFFIXES + REQUIRED CMAKE_FIND_ROOT_PATH_BOTH @@ -475,12 +500,14 @@ ONLY_CMAKE_FIND_ROOT_PATH PATHS PATH_SUFFIXES + REQUIRED IN ITEMS LISTS RANGE + ZIP_LISTS CACHE_VARIABLES @@ -520,11 +547,13 @@ SET SOURCE TARGET + TARGET_DIRECTORY TEST VARIABLE AND + COMMAND DEFINED EQUAL EXISTS @@ -600,6 +629,7 @@ DESCENDING FILE_BASENAME INSENSITIVE + NATURAL SENSITIVE STRING @@ -617,6 +647,9 @@ AUTHOR_WARNING + CHECK_FAIL + CHECK_PASS + CHECK_START DEBUG DEPRECATION FATAL_ERROR @@ -645,6 +678,7 @@ PROPERTY SOURCE TARGET + TARGET_DIRECTORY TEST VARIABLE @@ -675,6 +709,7 @@ GENEX_STRIP GREATER GREATER_EQUAL + HEX JOIN LENGTH LESS @@ -718,6 +753,7 @@ AND + COMMAND DEFINED EQUAL EXISTS @@ -862,6 +898,10 @@ NAMESPACE TARGETS + + DIRECTORY + TARGET_DIRECTORY + AFTER BEFORE @@ -964,7 +1004,9 @@ Swift + DIRECTORY PROPERTIES + TARGET_DIRECTORY PROPERTIES @@ -996,6 +1038,11 @@ c_std_90 c_std_99 c_variadic_macros + cuda_std_03 + cuda_std_11 + cuda_std_14 + cuda_std_17 + cuda_std_20 cxx_aggregate_default_initializers cxx_alias_templates cxx_alignas @@ -1208,13 +1255,20 @@ INCLUDE_LABEL PARALLEL_LEVEL QUIET + REPEAT RETURN_VALUE SCHEDULE_RANDOM START + STOP_ON_FAILURE STOP_TIME STRIDE TEST_LOAD + + AFTER_TIMEOUT + UNTIL_FAIL + UNTIL_PASS + QUIET RETURN_VALUE @@ -1229,10 +1283,14 @@ ANDROID APPLE + ARGC + ARGN + ARGV BORLAND BUILD_SHARED_LIBS BUILD_TESTING CMAKE_ABSOLUTE_DESTINATION_FILES + CMAKE_AIX_EXPORT_ALL_SYMBOLS CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS CMAKE_ANDROID_API CMAKE_ANDROID_API_MIN @@ -1303,14 +1361,24 @@ CMAKE_CONFIGURATION_TYPES CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR + CMAKE_CROSS_CONFIGS + CMAKE_CTEST_ARGUMENTS CMAKE_CTEST_COMMAND + CMAKE_CUDA_ARCHITECTURES + CMAKE_CUDA_COMPILE_FEATURES CMAKE_CUDA_EXTENSIONS + CMAKE_CUDA_HOST_COMPILER CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS + CMAKE_CUDA_RUNTIME_LIBRARY CMAKE_CUDA_SEPARABLE_COMPILATION CMAKE_CUDA_STANDARD CMAKE_CUDA_STANDARD_REQUIRED CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES CMAKE_CURRENT_BINARY_DIR + CMAKE_CURRENT_FUNCTION + CMAKE_CURRENT_FUNCTION_LIST_DIR + CMAKE_CURRENT_FUNCTION_LIST_FILE + CMAKE_CURRENT_FUNCTION_LIST_LINE CMAKE_CURRENT_LIST_DIR CMAKE_CURRENT_LIST_FILE CMAKE_CURRENT_LIST_LINE @@ -1325,9 +1393,13 @@ CMAKE_C_STANDARD_REQUIRED CMAKE_DEBUG_POSTFIX CMAKE_DEBUG_TARGET_PROPERTIES + CMAKE_DEFAULT_BUILD_TYPE + CMAKE_DEFAULT_CONFIGS CMAKE_DEPENDS_IN_PROJECT_ONLY CMAKE_DIRECTORY_LABELS + CMAKE_DISABLE_PRECOMPILE_HEADERS CMAKE_DL_LIBS + CMAKE_DOTNET_TARGET_FRAMEWORK CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT @@ -1349,6 +1421,7 @@ CMAKE_EXTRA_INCLUDE_FILES CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES CMAKE_FIND_APPBUNDLE + CMAKE_FIND_DEBUG_MODE CMAKE_FIND_FRAMEWORK CMAKE_FIND_FRAMEWORK_EXTRA_LOCATIONS CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX @@ -1383,8 +1456,10 @@ CMAKE_Fortran_MODDIR_FLAG CMAKE_Fortran_MODOUT_FLAG CMAKE_Fortran_MODULE_DIRECTORY + CMAKE_Fortran_PREPROCESS CMAKE_GENERATOR CMAKE_GENERATOR_INSTANCE + CMAKE_GENERATOR_NO_COMPILER_ENV CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GLOBAL_AUTOGEN_TARGET @@ -1393,7 +1468,6 @@ CMAKE_GLOBAL_AUTORCC_TARGET_NAME CMAKE_GNUtoMS CMAKE_HAS_ANSI_STRING_STREAM - CMAKE_HOME_DIRECTORY CMAKE_HOST_APPLE CMAKE_HOST_SOLARIS CMAKE_HOST_SYSTEM @@ -1462,7 +1536,6 @@ CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP CMAKE_INSTALL_UCRT_LIBRARIES - CMAKE_INTERNAL_PLATFORM_ABI CMAKE_INTERPROCEDURAL_OPTIMIZATION CMAKE_IOS_INSTALL_COMBINED CMAKE_JOB_POOLS @@ -1489,7 +1562,10 @@ CMAKE_MAKE_PROGRAM CMAKE_MATCH_COUNT CMAKE_MAXIMUM_RECURSION_DEPTH + CMAKE_MESSAGE_CONTEXT + CMAKE_MESSAGE_CONTEXT_SHOW CMAKE_MESSAGE_INDENT + CMAKE_MESSAGE_LOG_LEVEL CMAKE_MFC_FLAG CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_MINOR_VERSION @@ -1501,7 +1577,6 @@ CMAKE_NETRC CMAKE_NETRC_FILE CMAKE_NINJA_OUTPUT_PATH_PREFIX - CMAKE_NOT_USING_CONFIG_FLAGS CMAKE_NO_ANSI_FOR_SCOPE CMAKE_NO_ANSI_STREAM_HEADERS CMAKE_NO_ANSI_STRING_STREAM @@ -1514,6 +1589,7 @@ CMAKE_OSX_SYSROOT CMAKE_PARENT_LIST_FILE CMAKE_PATCH_VERSION + CMAKE_PCH_WARN_INVALID CMAKE_PDB_OUTPUT_DIRECTORY CMAKE_POSITION_INDEPENDENT_CODE CMAKE_PREFIX_PATH @@ -1558,8 +1634,6 @@ CMAKE_STATIC_LINKER_FLAGS_INIT CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE - CMAKE_SUPPRESS_DEVELOPER_ERRORS - CMAKE_SUPPRESS_DEVELOPER_WARNINGS CMAKE_SUPPRESS_REGENERATION CMAKE_SWIG_FLAGS CMAKE_SWIG_OUTDIR @@ -1600,7 +1674,6 @@ CMAKE_VS_GLOBALS CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD - CMAKE_VS_INTEL_Fortran_PROJECT_VERSION CMAKE_VS_JUST_MY_CODE_DEBUGGING CMAKE_VS_MSBUILD_COMMAND CMAKE_VS_NsightTegra_VERSION @@ -1629,6 +1702,7 @@ CMAKE_XCODE_SCHEME_DISABLE_MAIN_THREAD_CHECKER CMAKE_XCODE_SCHEME_DYNAMIC_LIBRARY_LOADS CMAKE_XCODE_SCHEME_DYNAMIC_LINKER_API_USAGE + CMAKE_XCODE_SCHEME_ENVIRONMENT CMAKE_XCODE_SCHEME_GUARD_MALLOC CMAKE_XCODE_SCHEME_MAIN_THREAD_CHECKER_STOP CMAKE_XCODE_SCHEME_MALLOC_GUARD_EDGES @@ -1638,10 +1712,12 @@ CMAKE_XCODE_SCHEME_THREAD_SANITIZER_STOP CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP + CMAKE_XCODE_SCHEME_WORKING_DIRECTORY CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS CPACK_ABSOLUTE_DESTINATION_FILES CPACK_ARCHIVE_COMPONENT_INSTALL CPACK_ARCHIVE_FILE_NAME + CPACK_ARCHIVE_THREADS CPACK_BUILD_SOURCE_DIRS CPACK_BUNDLE_APPLE_CERT_APP CPACK_BUNDLE_APPLE_CODESIGN_FILES @@ -1706,9 +1782,9 @@ CPACK_DMG_SLA_LANGUAGES CPACK_DMG_VOLUME_NAME CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION - CPACK_EXT_ENABLE_STAGING - CPACK_EXT_PACKAGE_SCRIPT - CPACK_EXT_REQUESTED_VERSIONS + CPACK_EXTERNAL_ENABLE_STAGING + CPACK_EXTERNAL_PACKAGE_SCRIPT + CPACK_EXTERNAL_REQUESTED_VERSIONS CPACK_GENERATOR CPACK_IFW_ADMIN_TARGET_DIRECTORY CPACK_IFW_BINARYCREATOR_EXECUTABLE @@ -1752,7 +1828,6 @@ CPACK_INSTALL_CMAKE_PROJECTS CPACK_INSTALL_COMMANDS CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS - CPACK_INSTALL_SCRIPT CPACK_INSTALL_SCRIPTS CPACK_MONOLITHIC_INSTALL CPACK_NSIS_COMPRESSOR @@ -1765,19 +1840,26 @@ CPACK_NSIS_EXTRA_INSTALL_COMMANDS CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS + CPACK_NSIS_FINISH_TITLE + CPACK_NSIS_FINISH_TITLE_3LINES CPACK_NSIS_HELP_LINK CPACK_NSIS_INSTALLED_ICON_NAME CPACK_NSIS_INSTALLER_MUI_ICON_CODE CPACK_NSIS_INSTALL_ROOT + CPACK_NSIS_MANIFEST_DPI_AWARE CPACK_NSIS_MENU_LINKS CPACK_NSIS_MODIFY_PATH CPACK_NSIS_MUI_FINISHPAGE_RUN + CPACK_NSIS_MUI_HEADERIMAGE CPACK_NSIS_MUI_ICON CPACK_NSIS_MUI_UNIICON CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP CPACK_NSIS_PACKAGE_NAME + CPACK_NSIS_UNINSTALL_NAME CPACK_NSIS_URL_INFO_ABOUT + CPACK_NSIS_WELCOME_TITLE + CPACK_NSIS_WELCOME_TITLE_3LINES CPACK_NUGET_COMPONENT_INSTALL CPACK_NUGET_PACKAGE_AUTHORS CPACK_NUGET_PACKAGE_COPYRIGHT @@ -1794,10 +1876,8 @@ CPACK_NUGET_PACKAGE_TAGS CPACK_NUGET_PACKAGE_TITLE CPACK_NUGET_PACKAGE_VERSION - CPACK_OSX_PACKAGE_VERSION CPACK_OUTPUT_CONFIG_FILE CPACK_PACKAGE_CHECKSUM - CPACK_PACKAGE_CONTACT CPACK_PACKAGE_DESCRIPTION CPACK_PACKAGE_DESCRIPTION_FILE CPACK_PACKAGE_DESCRIPTION_SUMMARY @@ -1809,7 +1889,6 @@ CPACK_PACKAGE_INSTALL_DIRECTORY CPACK_PACKAGE_INSTALL_REGISTRY_KEY CPACK_PACKAGE_NAME - CPACK_PACKAGE_RELOCATABLE CPACK_PACKAGE_VENDOR CPACK_PACKAGE_VERSION CPACK_PACKAGE_VERSION_MAJOR @@ -1818,6 +1897,16 @@ CPACK_PACKAGING_INSTALL_PREFIX CPACK_PKGBUILD_IDENTITY_NAME CPACK_PKGBUILD_KEYCHAIN_PATH + CPACK_PRODUCTBUILD_BACKGROUND + CPACK_PRODUCTBUILD_BACKGROUND_ALIGNMENT + CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA + CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA_ALIGNMENT + CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA_MIME_TYPE + CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA_SCALING + CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA_UTI + CPACK_PRODUCTBUILD_BACKGROUND_MIME_TYPE + CPACK_PRODUCTBUILD_BACKGROUND_SCALING + CPACK_PRODUCTBUILD_BACKGROUND_UTI CPACK_PRODUCTBUILD_IDENTITY_NAME CPACK_PRODUCTBUILD_KEYCHAIN_PATH CPACK_PRODUCTBUILD_RESOURCES_DIR @@ -1875,8 +1964,10 @@ CPACK_RPM_PACKAGE_VENDOR CPACK_RPM_PACKAGE_VERSION CPACK_RPM_POST_INSTALL_SCRIPT_FILE + CPACK_RPM_POST_TRANS_SCRIPT_FILE CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE CPACK_RPM_PRE_INSTALL_SCRIPT_FILE + CPACK_RPM_PRE_TRANS_SCRIPT_FILE CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE CPACK_RPM_RELOCATION_PATHS CPACK_RPM_SOURCE_PKG_BUILD_PARAMS @@ -1972,6 +2063,8 @@ CTEST_P4_COMMAND CTEST_P4_OPTIONS CTEST_P4_UPDATE_OPTIONS + CTEST_RESOURCE_SPEC_FILE + CTEST_RUN_CURRENT_SCRIPT CTEST_SCP_COMMAND CTEST_SITE CTEST_SOURCE_DIRECTORY @@ -2069,12 +2162,28 @@ XCODE_VERSION + + CMAKE_HOME_DIRECTORY + CMAKE_INTERNAL_PLATFORM_ABI + CMAKE_NOT_USING_CONFIG_FLAGS + CMAKE_SUPPRESS_DEVELOPER_ERRORS + CMAKE_SUPPRESS_DEVELOPER_WARNINGS + CMAKE_VS_INTEL_Fortran_PROJECT_VERSION + CPACK_INSTALL_PREFIX + CPACK_INSTALL_SCRIPT + CPACK_PACKAGE_CONTACT + CPACK_PACKAGE_RELOCATABLE + CPACK_TEMPORARY_DIRECTORY + CPACK_TOPLEVEL_DIRECTORY + + CC CFLAGS CMAKE_APPBUNDLE_PATH CMAKE_BUILD_PARALLEL_LEVEL CMAKE_CONFIG_TYPE + CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_FRAMEWORK_PATH CMAKE_GENERATOR CMAKE_GENERATOR_INSTANCE @@ -2114,6 +2223,7 @@ AUTOMOC_SOURCE_GROUP AUTOMOC_TARGETS_FOLDER AUTORCC_SOURCE_GROUP + CMAKE_CUDA_KNOWN_FEATURES CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES CMAKE_ROLE @@ -2183,6 +2293,7 @@ ADDITIONAL_CLEAN_FILES + AIX_EXPORT_ALL_SYMBOLS ALIASED_TARGET ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API @@ -2239,9 +2350,11 @@ COMPILE_PDB_NAME COMPILE_PDB_OUTPUT_DIRECTORY CROSSCOMPILING_EMULATOR + CUDA_ARCHITECTURES CUDA_EXTENSIONS CUDA_PTX_COMPILATION CUDA_RESOLVE_DEVICE_SYMBOLS + CUDA_RUNTIME_LIBRARY CUDA_SEPARABLE_COMPILATION CUDA_STANDARD CUDA_STANDARD_REQUIRED @@ -2254,7 +2367,9 @@ DEFINE_SYMBOL DEPLOYMENT_ADDITIONAL_FILES DEPLOYMENT_REMOTE_DIRECTORY + DEPRECATION DISABLE_PRECOMPILE_HEADERS + DOTNET_TARGET_FRAMEWORK DOTNET_TARGET_FRAMEWORK_VERSION ENABLE_EXPORTS EXCLUDE_FROM_ALL @@ -2267,6 +2382,7 @@ FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY + Fortran_PREPROCESS GENERATOR_FILE_NAME GNUtoMS HAS_CXX @@ -2325,6 +2441,8 @@ LINK_SEARCH_START_STATIC LINK_WHAT_YOU_USE LOCATION + MACHO_COMPATIBILITY_VERSION + MACHO_CURRENT_VERSION MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST @@ -2335,7 +2453,10 @@ NO_SONAME NO_SYSTEM_FROM_IMPORTED OSX_ARCHITECTURES + OSX_COMPATIBILITY_VERSION + OSX_CURRENT_VERSION OUTPUT_NAME + PCH_WARN_INVALID PDB_NAME PDB_OUTPUT_DIRECTORY POSITION_INDEPENDENT_CODE @@ -2366,6 +2487,7 @@ UNITY_BUILD_BATCH_SIZE UNITY_BUILD_CODE_AFTER_INCLUDE UNITY_BUILD_CODE_BEFORE_INCLUDE + UNITY_BUILD_MODE VERSION VISIBILITY_INLINES_HIDDEN VS_CONFIGURATION_TYPE @@ -2374,6 +2496,7 @@ VS_DEBUGGER_ENVIRONMENT VS_DEBUGGER_WORKING_DIRECTORY VS_DESKTOP_EXTENSIONS_VERSION + VS_DOTNET_DOCUMENTATION_FILE VS_DOTNET_REFERENCES VS_DOTNET_REFERENCES_COPY_LOCAL VS_DOTNET_TARGET_FRAMEWORK_VERSION @@ -2388,12 +2511,14 @@ VS_MOBILE_EXTENSIONS_VERSION VS_NO_SOLUTION_DEPLOY VS_PACKAGE_REFERENCES + VS_PLATFORM_TOOLSET VS_PROJECT_IMPORT VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER VS_SDK_REFERENCES + VS_SOLUTION_DEPLOY VS_USER_PROPS VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION VS_WINRT_COMPONENT @@ -2423,6 +2548,7 @@ XCODE_SCHEME_THREAD_SANITIZER_STOP XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP + XCODE_SCHEME_WORKING_DIRECTORY XCODE_SCHEME_ZOMBIE_OBJECTS XCTEST @@ -2435,6 +2561,7 @@ COMPILE_OPTIONS EXTERNAL_OBJECT Fortran_FORMAT + Fortran_PREPROCESS GENERATED HEADER_FILE_ONLY INCLUDE_DIRECTORIES @@ -2459,6 +2586,7 @@ VS_DEPLOYMENT_LOCATION VS_INCLUDE_IN_VSIX VS_RESOURCE_GENERATOR + VS_SETTINGS VS_SHADER_DISABLE_OPTIMIZATIONS VS_SHADER_ENABLE_DEBUG VS_SHADER_ENTRYPOINT @@ -2548,6 +2676,10 @@ COMPILE_FEATURES COMPILE_LANG_AND_ID COMPILE_LANGUAGE + LINK_LANG_AND_ID + LINK_LANGUAGE + DEVICE_LINK + HOST_LINK ANGLE-R COMMA SEMICOLON @@ -2599,6 +2731,7 @@ + @@ -2606,11 +2739,11 @@ - - - - - + + + + + @@ -2618,17 +2751,17 @@ - - + + - + - + @@ -2642,7 +2775,7 @@ - + @@ -2704,9 +2837,7 @@ - - - + @@ -2728,6 +2859,14 @@ + + + + + + + + @@ -3309,6 +3448,7 @@ + @@ -3625,6 +3765,7 @@ + @@ -3661,6 +3802,7 @@ + @@ -3695,6 +3837,7 @@ + @@ -3721,16 +3864,17 @@ + + - - - + + + + @@ -3759,7 +3903,10 @@ + + + @@ -3769,7 +3916,6 @@ - @@ -3811,7 +3957,6 @@ - @@ -3825,6 +3970,7 @@ + @@ -3872,6 +4018,7 @@ + @@ -3889,6 +4036,8 @@ + + @@ -3930,25 +4079,21 @@ - + - - - - - - + - + + @@ -3959,6 +4104,7 @@ + @@ -3971,11 +4117,13 @@ - + + + + - - - + + @@ -3984,41 +4132,62 @@ - - + + + + + - + + + + + + + + + + + + - + - + + + - + + + + + + - + @@ -4047,9 +4216,10 @@ - + - + + @@ -4065,11 +4235,12 @@ - + + - + diff --git a/syntax/coffee.xml b/syntax/coffee.xml --- a/syntax/coffee.xml +++ b/syntax/coffee.xml @@ -2,7 +2,7 @@ - + - + @@ -173,7 +173,7 @@ - + @@ -197,10 +197,12 @@ + + @@ -225,7 +227,7 @@ - + @@ -238,58 +240,72 @@ + + - + - - - + + + + + + - + - + + - + - - - - - - - + + + + + + + + + + + + + + + - + - - + + @@ -323,13 +339,16 @@ + + + - + @@ -338,3 +357,4 @@ + diff --git a/syntax/coldfusion.xml b/syntax/coldfusion.xml --- a/syntax/coldfusion.xml +++ b/syntax/coldfusion.xml @@ -1,6 +1,6 @@ - + @@ -510,111 +510,109 @@ - - - - - + + + + + - - - - - - + + + + + + + + + + + + + + + + + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - + + + + - + + + - + + - + + + @@ -623,49 +621,49 @@ - + - - + + - + - + - + - - + + - + - + - + - + - + @@ -674,41 +672,42 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -718,9 +717,7 @@ - - - + @@ -729,3 +726,4 @@ + diff --git a/syntax/commonlisp.xml b/syntax/commonlisp.xml --- a/syntax/commonlisp.xml +++ b/syntax/commonlisp.xml @@ -1,6 +1,6 @@ - + < @@ -1114,8 +1114,8 @@ - - + + @@ -1125,13 +1125,16 @@ + + - - + + + @@ -1147,6 +1150,10 @@ + + + + @@ -1171,7 +1178,8 @@ - + + diff --git a/syntax/cs.xml b/syntax/cs.xml --- a/syntax/cs.xml +++ b/syntax/cs.xml @@ -1,5 +1,5 @@ - + abstract @@ -100,9 +100,8 @@ - - - + + @@ -110,11 +109,11 @@ - - + + - - + + @@ -137,10 +136,21 @@ - + + + + - + + + + + + + + + @@ -161,8 +171,9 @@ - + + diff --git a/syntax/css.xml b/syntax/css.xml --- a/syntax/css.xml +++ b/syntax/css.xml @@ -38,7 +38,7 @@ --> - + @@ -1585,6 +1585,7 @@ + @@ -1731,8 +1732,9 @@ - + + diff --git a/syntax/curry.xml b/syntax/curry.xml --- a/syntax/curry.xml +++ b/syntax/curry.xml @@ -30,7 +30,7 @@ ]> - @@ -229,13 +229,18 @@ + + - + + + + @@ -356,9 +361,10 @@ - + + diff --git a/syntax/d.xml b/syntax/d.xml --- a/syntax/d.xml +++ b/syntax/d.xml @@ -99,7 +99,7 @@ ======================================================================== --> - + @@ -737,17 +737,20 @@ + + - - - + + + + @@ -864,14 +867,14 @@ - - - + + + - - + + - + @@ -879,20 +882,20 @@ - - + + - - + + - - - - + + + + - + @@ -917,10 +920,10 @@ - - - - + + + + @@ -932,3 +935,4 @@ + diff --git a/syntax/diff.xml b/syntax/diff.xml --- a/syntax/diff.xml +++ b/syntax/diff.xml @@ -2,9 +2,6 @@ - - - ]> - + - - + + + - - - + + + + - - + + - + - + + - + - + + - + - - + + + - + - + - + - - + + + - - + + + @@ -101,6 +105,13 @@ + + + + + + + diff --git a/syntax/djangotemplate.xml b/syntax/djangotemplate.xml --- a/syntax/djangotemplate.xml +++ b/syntax/djangotemplate.xml @@ -4,7 +4,7 @@ ]> - + diff --git a/syntax/dot.xml b/syntax/dot.xml --- a/syntax/dot.xml +++ b/syntax/dot.xml @@ -1,7 +1,7 @@ - + @@ -133,12 +133,16 @@ + + + + @@ -162,7 +166,7 @@ - + @@ -170,3 +174,4 @@ + diff --git a/syntax/doxygen.xml b/syntax/doxygen.xml --- a/syntax/doxygen.xml +++ b/syntax/doxygen.xml @@ -2,9 +2,11 @@ + + ]> \endrtfonly @endrtfonly \endsecreflist @endsecreflist \endxmlonly @endxmlonly - \f[ @f[ - \f] @f] - \f$ @f$ - \hideinitializer @hideinitializer \htmlonly @htmlonly @@ -84,21 +82,6 @@ \test @test \version @version \xmlonly @xmlonly - - \# @# - \$ @$ - \% @% - \& @& - \> @> - \< @< - \" @" - \:: @:: - \@ @@ - \\ @\ - \~ @~ - \. @. - \-- @-- - \--- @--- @@ -202,6 +185,12 @@ \var @var \vhdlflow @vhdlflow + + \endcode @endcode + \endverbatim @endverbatim + \endmsc @endmsc + \enddot @enddot + \note @note @@ -231,8 +220,8 @@ TODO Not all commands are handled properly nowadays :( Need few more contexts... --> - - + + @@ -242,38 +231,21 @@ - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - - - - - - + + + + + - - - - - - - - + + - + - + - - + + + + + + + + - + - + + - + + + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - - + + + + - - - - - - - - + - + - - + + + + - + + + + - + @@ -411,52 +514,90 @@ - - - - - - - - - - - + + + + + - - - - + + + - - - + + + - - - + + + + + - - - + + + - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -480,10 +621,11 @@ + - + diff --git a/syntax/doxygenlua.xml b/syntax/doxygenlua.xml --- a/syntax/doxygenlua.xml +++ b/syntax/doxygenlua.xml @@ -2,20 +2,22 @@ + ]> \endrtfonly @endrtfonly \endsecreflist @endsecreflist \endxmlonly @endxmlonly - \f[ @f[ - \f] @f] - \f$ @f$ - \hideinitializer @hideinitializer \htmlonly @htmlonly @@ -94,21 +92,6 @@ \test @test \version @version \xmlonly @xmlonly - - \# @# - \$ @$ - \% @% - \& @& - \> @> - \< @< - \" @" - \:: @:: - \@ @@ - \\ @\ - \~ @~ - \. @. - \-- @-- - \--- @--- @@ -212,6 +195,12 @@ \var @var \vhdlflow @vhdlflow + + \endcode @endcode + \endverbatim @endverbatim + \endmsc @endmsc + \enddot @enddot + \note @note @@ -241,174 +230,98 @@ TODO Not all commands are handled properly nowadays :( Need few more contexts... --> + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + - - - - + + - - - - - + + + + - - - - - - - - + - + - - + + + + - + + + + - + @@ -419,59 +332,96 @@ - - - - - - - - - - - + + + + - - - - + + + - - - + + + - - - + + + + + - - - + + + - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -488,10 +438,11 @@ + - + diff --git a/syntax/dtd.xml b/syntax/dtd.xml --- a/syntax/dtd.xml +++ b/syntax/dtd.xml @@ -3,7 +3,7 @@ ]> - + @@ -46,6 +46,7 @@ + @@ -101,10 +102,9 @@ - + - - + diff --git a/syntax/eiffel.xml b/syntax/eiffel.xml --- a/syntax/eiffel.xml +++ b/syntax/eiffel.xml @@ -10,7 +10,7 @@ Author of version 1.02: Sebastian Vuorinen --> - + agent @@ -97,7 +97,11 @@ - + + + + + @@ -118,8 +122,9 @@ - + + diff --git a/syntax/elixir.xml b/syntax/elixir.xml --- a/syntax/elixir.xml +++ b/syntax/elixir.xml @@ -30,7 +30,7 @@ name="Elixir" section="Sources" style="elixir" - version="5"> + version="6"> catch @@ -180,6 +180,9 @@ + + + @@ -223,3 +226,4 @@ + diff --git a/syntax/elm.xml b/syntax/elm.xml --- a/syntax/elm.xml +++ b/syntax/elm.xml @@ -1,6 +1,6 @@ - + type @@ -38,9 +38,9 @@ - + - + @@ -56,7 +56,7 @@ - + @@ -69,10 +69,16 @@ + + + - - + + + + + @@ -108,7 +114,7 @@ - + @@ -135,9 +141,10 @@ - - + + + diff --git a/syntax/erlang.xml b/syntax/erlang.xml --- a/syntax/erlang.xml +++ b/syntax/erlang.xml @@ -36,7 +36,7 @@ - fixed highlighting problem when '@' at end of atom/variable --> - + @@ -213,13 +213,14 @@ - + + diff --git a/syntax/fasm.xml b/syntax/fasm.xml --- a/syntax/fasm.xml +++ b/syntax/fasm.xml @@ -1,897 +1,1750 @@ - - - - - - - - rax - eax - ax - ah - al - rbx - ebx - bx - bh - bl - rcx - ecx - cx - ch - cl - rdx - edx - dx - dh - dl - rbp - ebp - bp - rsi - esi - si - rdi - edi - di - rsp - esp - sp - r8 - r9 - r10 - r11 - r12 - r13 - r14 - r15 - - cs - ds - es - fs - gs - ss - - cr0 - - cr2 - cr3 - cr4 - - dr0 - dr1 - dr2 - dr3 - dr6 - dr7 - - st - - mm0 - mm1 - mm2 - mm3 - mm4 - mm5 - mm6 - mm7 - - xmm0 - xmm1 - xmm2 - xmm3 - xmm4 - xmm5 - xmm6 - xmm7 - - - aaa - aad - aam - aas - adc - add - addpd - addps - addsd - addss - addsubpd - addsubps - and - andnpd - andnps - andpd - andps - arpl - bound - bsf - bsr - bswap - bt - btc - btr - bts - call - cbw - cwde - cwd - cdq - cdqe - cqo - clc - cld - clgi - cli - clts - clflush - cmc - cmova - cmovae - cmovb - cmovbe - cmovc - cmove - cmovg - cmovge - cmovl - cmovle - cmovna - cmovnae - cmovnb - cmovnbe - cmovnc - cmovne - cmovng - cmovnge - cmovnl - cmovnle - cmovno - cmovnp - cmovns - cmovnz - cmovo - cmovp - cmovpe - cmovpo - cmovs - cmovz - cmp - cmpeqpd - cmpeqps - cmpeqsd - cmpeqss - cmplepd - cmpleps - cmplesd - cmpless - cmpltpd - cmpltps - cmpltsd - cmpltss - cmpneqpd - cmpneqps - cmpneqsd - cmpneqss - cmpnlepd - cmpnleps - cmpnlesd - cmpnless - cmpnltpd - cmpnltps - cmpnltsd - cmpnltss - cmpordpd - cmpordps - cmpordsd - cmpordss - cmppd - cmpps - cmps - cmpsb - cmpsd - cmpss - cmpsw - cmpunordpd - cmpunordps - cmpunordsd - cmpunordss - cmpxchg - cmpxchg486 - cmpxchg8b - cmpxchg16b - comisd - comiss - cpuid - cvtdq2pd - cvtdq2ps - cvtpd2dq - cvtpd2pi - cvtpd2ps - cvtpi2pd - cvtpi2ps - cvtps2dq - cvtps2pd - cvtps2pi - cvtsd2si - cvtsd2ss - cvtsi2sd - cvtsi2ss - cvtss2sd - cvtss2si - cvttpd2dq - cvttpd2pi - cvttps2dq - cvttps2pi - cvttsd2si - cvttss2si - daa - das - dec - div - divpd - divps - divsd - divss - emms - enter - f2xm1 - fabs - fadd - faddp - fbld - fbstp - fchs - fclex - fnclex - fcmovb - fcmovbe - fcmove - fcmovnb - fcmovnbe - fcmovne - fcmovnu - fcmovu - fcom - fcomp - fcompp - fcomi - fcomip - fcos - fdecstp - fdisi - feni - fdiv - fdivr - fdivp - fdivrp - femms - ffree - ffreep - fiadd - ficom - ficomp - fidiv - fidivr - fild - fimul - fincstp - finit - fist - fistp - fisttp - fisub - fisubr - fld - fld1 - fldl2e - fldl2t - fldlg2 - fldln2 - fldcw - fldenv - fldpi - fldz - fmul - fmulp - fndisi - fneni - fninit - fnop - fnsave - fnstcw - fnstenv - fnstsw - fnwait - fpatan - fptan - fprem - fprem1 - frndint - frstor - fsave - fscale - fsetpm - fsin - fsincos - fsqrt - fst - fstp - fstcw - fstenv - fstsw - fsub - fsubr - fsubp - fsubrp - ftst - fucom - fucomp - fucompp - fucomi - fucomip - fwait - fxam - fxch - fxrstor - fxsave - fxtract - fyl2x - fyl2xp1 - haddpd - haddps - hlt - hsubpd - hsubps - ibts - idiv - imul - in - inc - ins - insb - insd - insw - int - int1 - int3 - into - invd - invlpg - invlpga - iret - iretd - iretq - iretw - ja - jae - jb - jbe - jc - je - jg - jge - jl - jle - jna - jnae - jnb - jnbe - jnc - jne - jng - jnge - jnl - jnle - jno - jnp - jns - jnz - jo - jp - jpe - jpo - js - jz - jcxz - jecxz - jrcxz - jmp - lahf - lar - lddqu - ldmxcsr - lds - les - lea - leave - lfence - lfs - lgdt - lgs - lidt - lldt - lmsw - loadall - loadall286 - lods - lodsb - lodsd - lodsq - lodsw - loop - loope - loopne - loopnz - loopz - lsl - lss - ltr - maskmovdqu - maskmovq - maxpd - maxps - maxsd - maxss - mfence - minpd - minps - minsd - minss - monitor - mov - movapd - movaps - movd - movddup - movdq2q - movdqa - movdqu - movhlps - movhpd - movhps - movlhps - movlpd - movlps - movmskpd - movmskps - movntdq - movnti - movntpd - movntps - movntq - movq - movq2dq - movs - movsb - movsd - movshdup - movsldup - movsq - movss - movsx - movsxd - movsw - movupd - movups - movzx - mul - mulpd - mulps - mulsd - mulss - mwait - neg - nop - not - or - orpd - orps - out - outs - outsb - outsw - outsd - packssdw - packsswb - packuswb - paddb - paddd - paddq - paddsb - paddsw - paddusb - paddusw - paddw - pand - pandn - pause - pavgb - pavgusb - pavgw - pcmpeqb - pcmpeqw - pcmpeqd - pcmpgtb - pcmpgtw - pcmpgtd - pdistib - pextrw - pf2id - pf2iw - pfacc - pfadd - pfcmpeq - pfcmpge - pfcmpgt - pfmax - pfmin - pfmul - pfnacc - pfpnacc - pfrcp - pfrcpit1 - pfrcpit2 - pfrsqit1 - pfrsqrt - pfsub - pfsubr - pi2fd - pi2fw - pinsrw - pmachriw - pmaddwd - pmagw - pmaxsw - pmaxub - pminsw - pminub - pmovmskb - pmulhrw - pmulhuw - pmulhw - pmullw - pmuludq - pmvgezb - pmvlzb - pmvnzb - pmvzb - pop - popa - popaw - popad - popf - popfw - popfd - popfq - por - prefetch - prefetchnta - prefetcht0 - prefetcht1 - prefetcht2 - prefetchw - psadbw - pshufd - pshufhw - pshuflw - pshufw - pslld - pslldq - psllq - psllw - psrad - psraw - psrld - psrldq - psrlq - psrlw - psubb - psubd - psubq - psubsb - psubsiw - psubsw - psubusb - psubusw - psubw - pswapd - punpckhbw - punpckhdq - punpckhqdq - punpckhwd - punpcklbw - punpckldq - punpcklqdq - punpcklwd - push - pusha - pushad - pushaw - pushf - pushfd - pushfq - pushfw - pxor - rcl - rcr - rcpps - rcpss - rdmsr - rdpmc - rdshr - rdtsc - rdtscp - ret - retf - retn - rol - ror - rsdc - rsldt - rsm - rsqrtps - rsqrtss - rsts - sahf - sal - sar - salc - sbb - scas - scasb - scasd - scasq - scasw - seta - setae - setb - setbe - setc - sete - setg - setge - setl - setle - setna - setnae - setnb - setnbe - setnc - setne - setng - setnge - setnl - setnle - setno - setnp - setns - setnz - seto - setp - setpe - setpo - sets - setz - sfence - sgdt - shl - shld - shr - shrd - shufpd - shufps - sidt - skinit - sldt - smi - smint - smintold - smsw - sqrtpd - sqrtps - sqrtsd - sqrtss - stc - std - stgi - sti - stmxcsr - stos - stosb - stosd - stosq - stosw - str - sub - subpd - subps - subsd - subss - svdc - svldt - svts - swapgs - syscall - sysenter - sysexit - sysret - test - ucomisd - ucomiss - ud0 - ud1 - ud2 - umov - unpckhpd - unpckhps - unpcklpd - unpcklps - verr - verw - vmload - vmmcall - vmrun - vmsave - wait - wbinvd - wrmsr - wrshr - xadd - xbts - xchg - xlat - xlatb - xor - xorpd - xorps - - - - - db - dw - du - dd - dp - df - dq - dt - - rb - rw - rd - rp - rf - rq - rt - - file - - byte - word - dword - pword - qword - tbyte - tword - dqword - ptr - - - - append - at - break - common - display - else - end - equ - fix - foward - if - irp - irps - label - local - match - macro - purge - repeat - rept - reverse - restore - struc - times - while - virtual - - - - align - entry - extrn - format - include - invoke - data - load - from - heap - org - proc - public - section - segment - stack - store - use16 - use32 - use64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + +]> + + + + + rax + eax + ax + ah + al + rbx + ebx + bx + bh + bl + rcx + ecx + cx + ch + cl + rdx + edx + dx + dh + dl + rbp + ebp + bp + rsi + esi + si + rdi + edi + di + rsp + esp + sp + r8 + r9 + r10 + r11 + r12 + r13 + r14 + r15 + + cs + ds + es + fs + gs + ss + + cr0 + + cr2 + cr3 + cr4 + + dr0 + dr1 + dr2 + dr3 + dr6 + dr7 + + st0 + st1 + st2 + st3 + st4 + st5 + st6 + st7 + + mm0 + mm1 + mm2 + mm3 + mm4 + mm5 + mm6 + mm7 + + xmm0 + xmm1 + xmm2 + xmm3 + xmm4 + xmm5 + xmm6 + xmm7 + + ymm0 + ymm1 + ymm2 + ymm3 + ymm4 + ymm5 + ymm6 + ymm7 + + zmm0 + zmm1 + zmm2 + zmm3 + zmm4 + zmm5 + zmm6 + zmm7 + + k0 + k1 + k2 + k3 + k4 + k5 + k6 + k7 + + bnd0 + bnd1 + bnd2 + bnd3 + + + + call + ja + jae + jb + jbe + jc + je + jg + jge + jl + jle + jmp + jna + jnae + jnb + jnbe + jnc + jne + jng + jnge + jnl + jnle + jno + jnp + jns + jnz + jo + jp + jpe + jpo + js + jz + jcxz + jecxz + loop + loopd + loope + looped + loopew + loopne + loopned + loopnew + loopnz + loopnzd + loopnzw + loopw + loopz + loopzd + loopzw + loopnz + loopnzd + loopnzw + loopz + loopzw + ret + retd + retf + retfd + retfw + retn + retnd + retnw + retw + iret + iretd + iretq + iretw + rsm + syscall + sysenter + sysexit + sysret + syscallq + sysretq + + + + aaa + aad + aam + aas + adc + add + addpd + addps + addsd + addss + addsubpd + addsubps + aesdec + aesdeclast + aesenc + aesenclast + aesimc + aeskeygenassist + and + andn + andnpd + andnps + andpd + andps + arpl + bextr + blcfill + blci + blcic + blcmsk + blcs + blendpd + blendps + blendvpd + blendvps + blsfill + blsi + blsic + blsmsk + blsr + bndldx + bndmk + bndstx + bound + bsf + bsr + bswap + bt + btc + btr + bts + bzhi + cbw + cdq + cdqe + clc + cld + clflush + clgi + cli + clts + cmc + cmov + cmova + cmovae + cmovb + cmovbe + cmovc + cmove + cmovg + cmovge + cmovl + cmovle + cmovna + cmovnae + cmovnb + cmovnbe + cmovnc + cmovne + cmovng + cmovnge + cmovnl + cmovnle + cmovno + cmovnp + cmovns + cmovnz + cmovo + cmovp + cmovpe + cmovpo + cmovs + cmovz + cmp + cmpeq + cmpeqpd + cmpeqps + cmpeqsd + cmpeqss + cmple + cmplepd + cmpleps + cmplesd + cmpless + cmplt + cmpltpd + cmpltps + cmpltsd + cmpltss + cmpneq + cmpneqpd + cmpneqps + cmpneqsd + cmpneqss + cmpnle + cmpnlepd + cmpnleps + cmpnlesd + cmpnless + cmpnlt + cmpnltpd + cmpnltps + cmpnltsd + cmpnltss + cmpord + cmpordpd + cmpordps + cmpordsd + cmpordss + cmppd + cmpps + cmps + cmpsb + cmpsd + cmpsq + cmpss + cmpsw + cmpunord + cmpunordpd + cmpunordps + cmpunordsd + cmpunordss + cmpxchg16b + cmpxchg486 + cmpxchg8b + cmpxchg + comisd + comiss + compare + cpuid + cqo + crc32 + cvtdq2pd + cvtdq2ps + cvtpd2dq + cvtpd2pi + cvtpd2ps + cvtpi2pd + cvtpi2ps + cvtps2dq + cvtps2pd + cvtps2pi + cvtsd2si + cvtsd2ss + cvtsi2sd + cvtsi2ss + cvtss2sd + cvtss2si + cvttpd2dq + cvttpd2pi + cvttps2dq + cvttps2pi + cvttsd2si + cvttss2si + cwd + cwde + daa + das + dec + div + divpd + divps + divsd + divss + dppd + dpps + emms + enter + extractps + extrq + f2xm1 + fabs + fadd + faddp + fbld + fbstp + fchs + fclex + fcmovb + fcmovbe + fcmove + fcmovnb + fcmovnbe + fcmovne + fcmovnu + fcmovu + fcom + fcomi + fcomip + fcomp + fcompp + fcos + fdecstp + fdisi + fdiv + fdivp + fdivr + fdivrp + femms + feni + ffree + ffreep + fiadd + ficom + ficomp + fidiv + fidivr + fild + fimul + fincstp + finit + fist + fistp + fisttp + fisub + fisubr + fld1 + fld + fldcw + fldenv + fldenvd + fldenvw + fldl2e + fldl2t + fldlg2 + fldln2 + fldpi + fldz + fmul + fmulp + fnclex + fndisi + fneni + fninit + fnop + fnsave + fnsaved + fnsavew + fnstcw + fnstenv + fnstenvd + fnstenvw + fnstsw + fnwait + fpatan + fprem1 + fprem + fptan + frndint + frstor + frstord + frstorw + fsave + fsaved + fsavew + fscale + fsetpm + fsin + fsincos + fsqrt + fst + fstcw + fstenv + fstenvd + fstenvw + fstp + fstsw + fsub + fsubp + fsubr + fsubrp + ftst + fucom + fucomi + fucomip + fucomp + fucompp + fwait + fxam + fxch + fxrstor64 + fxrstor + fxsave64 + fxsave + fxtract + fyl2x + fyl2xp1 + getsec + haddpd + haddps + hlt + hsubpd + hsubps + ibts + idiv + imul + in + inc + ins + insb + insd + insertps + insertq + insw + int1 + int3 + int + into + invd + invept + invlpg + invlpga + invpcid + invvpid + lahf + lar + lddqu + ldmxcsr + lds + lea + leave + les + lfence + lfs + lgdt + lgs + lidt + lldt + lmsw + loadall286 + loadall + lock + lods + lodsb + lodsd + lodsq + lodsw + lsl + lss + ltr + lzcnt + maskmovdqu + maskmovq + maxpd + maxps + maxsd + maxss + mfence + minpd + minps + minsd + minss + monitor + mov + movapd + movaps + movbe + movd + movddup + movdq2q + movdqa + movdqu + movhlps + movhpd + movhps + movlhps + movlpd + movlps + movmskpd + movmskps + movntdq + movntdqa + movnti + movntpd + movntps + movntq + movntsd + movntss + movq2dq + movq + movs + movsb + movsd + movshdup + movsldup + movsq + movss + movsw + movsx + movsxd + movupd + movups + movzx + mpsadbw + mul + mulpd + mulps + mulsd + mulss + mulx + mwait + neg + nop + not + or + orpd + orps + out + outs + outsb + outsd + outsw + pabsb + pabsd + pabsw + packssdw + packsswb + packusdw + packuswb + paddb + paddd + paddq + paddsb + paddsw + paddusb + paddusw + paddw + palignr + pand + pandn + pause + pavgb + pavgusb + pavgw + pblendvb + pblendw + pclmulqdq + pcmpeqb + pcmpeqd + pcmpeqq + pcmpeqw + pcmpestri + pcmpestrm + pcmpgtb + pcmpgtd + pcmpgtq + pcmpgtw + pcmpistri + pcmpistrm + pdep + pdistib + pext + pextrb + pextrd + pextrq + pextrw + pf2id + pf2iw + pfacc + pfadd + pfcmpeq + pfcmpge + pfcmpgt + pfmax + pfmin + pfmul + pfnacc + pfpnacc + pfrcp + pfrcpit1 + pfrcpit2 + pfrsqit1 + pfrsqrt + pfsub + pfsubr + phaddd + phaddsw + phaddw + phminposuw + phsubd + phsubsw + phsubw + pi2fd + pi2fw + pinsrb + pinsrd + pinsrq + pinsrw + pmachriw + pmaddubsw + pmaddwd + pmagw + pmaxsb + pmaxsd + pmaxsw + pmaxub + pmaxud + pmaxuw + pminsb + pminsd + pminsw + pminub + pminud + pminuw + pmovmskb + pmovsxbd + pmovsxbq + pmovsxbw + pmovsxdq + pmovsxwd + pmovsxwq + pmovzxbd + pmovzxbq + pmovzxbw + pmovzxdq + pmovzxwd + pmovzxwq + pmuldq + pmulhrsw + pmulhrw + pmulhuw + pmulhw + pmulld + pmullw + pmuludq + pmvgezb + pmvlzb + pmvnzb + pmvzb + pop + popa + popad + popaw + popcnt + popd + popf + popfd + popfq + popfw + popw + por + prefetch + prefetchnta + prefetcht0 + prefetcht1 + prefetcht2 + prefetchw + psadbw + pshufb + pshufd + pshufhw + pshuflw + pshufw + psignb + psignd + psignw + pslld + pslldq + psllq + psllw + psrad + psraw + psrld + psrldq + psrlq + psrlw + psubb + psubd + psubq + psubsb + psubsiw + psubsw + psubusb + psubusw + psubw + pswapd + ptest + punpckhbw + punpckhdq + punpckhqdq + punpckhwd + punpcklbw + punpckldq + punpcklqdq + punpcklwd + push + pusha + pushad + pushaw + pushd + pushf + pushfd + pushfq + pushfw + pushw + pxor + rcl + rcpps + rcpss + rcr + rdfsbase + rdgsbase + rdmsr + rdmsrq + rdpmc + rdrand + rdshr + rdtsc + rdtscp + rol + ror + rorx + roundpd + roundps + roundsd + roundss + rsdc + rsldt + rsm + rsqrtps + rsqrtss + rsts + sahf + sal + salc + sar + sarx + sbb + scas + scasb + scasd + scasq + scasw + set + seta + setae + setb + setbe + setc + sete + setg + setge + setl + setle + setna + setnae + setnb + setnbe + setnc + setne + setng + setnge + setnl + setnle + setno + setnp + setns + setnz + seto + setp + setpe + setpo + sets + setz + sfence + sgdt + shl + shld + shlx + shr + shrd + shrx + shufpd + shufps + sidt + skinit + sldt + smi + smint + smintold + smsw + sqrtpd + sqrtps + sqrtsd + sqrtss + stc + std + stgi + sti + stmxcsr + stos + stosb + stosd + stosq + stosw + str + sub + subpd + subps + subsd + subss + svdc + svldt + svts + swapgs + t1mskc + test + tzcnt + tzmsk + ucomisd + ucomiss + ud0 + ud1 + ud2 + umov + unpckhpd + unpckhps + unpcklpd + unpcklps + vaesenc + vaesenclast + vaesimc + vblendvpd + vblendvps + vbroadcastf128 + vbroadcasti128 + vbroadcastsd + vbroadcastss + vcomisd + vcomiss + vcvtdq2pd + vcvtdq2ps + vcvtpd2dq + vcvtpd2ps + vcvtph2ps + vcvtps2dq + vcvtps2pd + vcvtps2ph + vcvtsd2si + vcvtsd2ss + vcvtsi2sd + vcvtsi2ss + vcvtss2sd + vcvtss2si + vcvttpd2dq + vcvttps2dq + vcvttsd2si + vcvttss2si + vdppd + verr + verw + vextractf128 + vextracti128 + vextractps + vfm132pd + vfm132ps + vfm132sd + vfm132ss + vfm213pd + vfm213ps + vfm213sd + vfm213ss + vfm231pd + vfm231ps + vfm231sd + vfm231ss + vfmaddpd + vfmaddsub132pd + vfmaddsub132ps + vfmaddsub213pd + vfmaddsub213ps + vfmaddsub231pd + vfmaddsub231ps + vfmsubadd132pd + vfmsubadd132ps + vfmsubadd213pd + vfmsubadd213ps + vfmsubadd231pd + vfmsubadd231ps + vfmsubss + vfnm132pd + vfnm132ps + vfnm132sd + vfnm132ss + vfnm213pd + vfnm213ps + vfnm213sd + vfnm213ss + vfnm231pd + vfnm231ps + vfnm231sd + vfnm231ss + vfrczpd + vfrczps + vfrczsd + vfrczss + vgatherdpd + vgatherdps + vgatherqpd + vgatherqps + vinsertf128 + vinserti128 + vinsertps + vlddqu + vldmxcsr + vmaskmovdqu + vmaskmovpd + vmaskmovps + vmcall + vmclear + vmlaunch + vmload + vmmcall + vmovapd + vmovaps + vmovd + vmovddup + vmovdqa + vmovdqu + vmovhlps + vmovhpd + vmovhps + vmovlhps + vmovlpd + vmovlps + vmovmskpd + vmovmskps + vmovntdq + vmovntdqa + vmovntpd + vmovntps + vmovq + vmovsd + vmovshdup + vmovsldup + vmovss + vmovupd + vmovups + vmptrld + vmptrst + vmread + vmresume + vmrun + vmsave + vmwrite + vmxoff + vmxon + vpabsb + vpabsd + vpabsw + vpackssdw + vpacksswb + vpackusdw + vpackuswb + vpaddb + vpaddd + vpaddq + vpaddsb + vpaddsw + vpaddusb + vpaddusw + vpaddw + vpalignr + vpand + vpandn + vpause + vpavgb + vpavgusb + vpavgw + vpblendvb + vpblendw + vpbroadcastb + vpbroadcastd + vpbroadcastq + vpbroadcastw + vpclmulqdq + vpcmov + vpcmpeqb + vpcmpeqd + vpcmpeqq + vpcmpeqw + vpcmpestri + vpcmpestrm + vpcmpgtb + vpcmpgtd + vpcmpgtq + vpcmpgtw + vpcmpistri + vpcmpistrm + vpcomb + vpcomd + vfmadd132ps + vfnmadd132ps + vfmsub132ps + vfnmsub132ps + vfmadd213ps + vfnmadd213ps + vfmsub213ps + vfnmsub213ps + vfmadd231ps + vfnmadd231ps + vfmsub231ps + vfnmsub231ps + vfmadd132pd + vfnmadd132pd + vfmsub132pd + vfnmsub132pd + vfmadd213pd + vfnmadd213pd + vfmsub213pd + vfnmsub213pd + vfmadd231pd + vfnmadd231pd + vfmsub231pd + vfnmsub231pd + vfmadd132ss + vfnmadd132ss + vfmsub132ss + vfnmsub132ss + vfmadd213ss + vfnmadd213ss + vfmsub213ss + vfnmsub213ss + vfmadd231ss + vfnmadd231ss + vfmsub231ss + vfnmsub231ss + vfmadd132sd + vfnmadd132sd + vfmsub132sd + vfnmsub132sd + vfmadd213sd + vfnmadd213sd + vfmsub213sd + vfnmsub213sd + vfmadd231sd + vfnmadd231sd + vfmsub231sd + vfnmsub231sd + vpcomeqb + vpcomeqd + vpcomeqq + vpcomequb + vpcomequd + vpcomequq + vpcomequw + vpcomeqw + vpcomfalseb + vpcomfalsed + vpcomfalseq + vpcomfalseub + vpcomfalseud + vpcomfalseuq + vpcomfalseuw + vpcomfalsew + vpcomgeb + vpcomged + vpcomgeq + vpcomgeub + vpcomgeud + vpcomgeuq + vpcomgeuw + vpcomgew + vpcomgtb + vpcomgtd + vpcomgtq + vpcomgtub + vpcomgtud + vpcomgtuq + vpcomgtuw + vpcomgtw + vpcomleb + vpcomled + vpcomleq + vpcomleub + vpcomleud + vpcomleuq + vpcomleuw + vpcomlew + vpcomltb + vpcomltd + vpcomltq + vpcomltub + vpcomltud + vpcomltuq + vpcomltuw + vpcomltw + vpcomneqb + vpcomneqd + vpcomneqq + vpcomnequb + vpcomnequd + vpcomnequq + vpcomnequw + vpcomneqw + vpcomq + vpcomtrueb + vpcomtrued + vpcomtrueq + vpcomtrueub + vpcomtrueud + vpcomtrueuq + vpcomtrueuw + vpcomtruew + vpcomub + vpcomud + vpcomuq + vpcomuw + vpcomw + vpdep + vpdistib + vperm2f128 + vperm2i128 + vpermd + vpermil2pd + vpermil2ps + vpermilpd + vpermilps + vpermpd + vpermps + vpermq + vpext + vpextrb + vpextrd + vpextrq + vpextrw + vpf2id + vpf2iw + vpfacc + vpfadd + vpfcmpeq + vpfcmpge + vpfcmpgt + vpfmax + vpfmin + vpfmul + vpfnacc + vpfpnacc + vpfrcp + vpfrcpit1 + vpfrcpit2 + vpfrsqit1 + vpfrsqrt + vpfsub + vpfsubr + vpgatherdd + vscatterdpd + vscatterdps + vscatterqpd + vscatterqps + vpscatterdd + vpscatterdq + vpscatterqd + vpscatterqq + vpgatherdq + vpgatherqd + vpgatherqq + vphaddbd + vphaddbq + vphaddbw + vphaddd + vphadddq + vphaddsw + vphaddubd + vphaddubq + vphaddubw + vphaddudq + vphadduwd + vphadduwq + vphaddw + vphaddwd + vphaddwq + vphminposuw + vphsubbw + vphsubd + vphsubdq + vphsubsw + vphsubw + vphsubwd + vpi2fd + vpi2fw + vpinsrb + vpinsrd + vpinsrq + vpinsrw + vpmachriw + vpmacsdd + vpmacsdqh + vpmacsdql + vpmacssdd + vpmacssdqh + vpmacssdql + vpmacsswd + vpmacssww + vpmacswd + vpmacsww + vpmadcsswd + vpmadcswd + vpmaddubsw + vpmaddwd + vpmagw + vpmaskmovd + vpmaskmovq + vpmaxsb + vpmaxsd + vpmaxsw + vpmaxub + vpmaxud + vpmaxuw + vpminsb + vpminsd + vpminsw + vpminub + vpminud + vpminuw + vpmovmskb + vpmovsxbd + vpmovsxbq + vpmovsxbw + vpmovsxdq + vpmovsxwd + vpmovsxwq + vpmovzxbd + vpmovzxbq + vpmovzxbw + vpmovzxdq + vpmovzxwd + vpmovzxwq + vpmuldq + vpmulhrsw + vpmulhrw + vpmulhuw + vpmulhw + vpmulld + vpmullw + vpmuludq + vpmvgezb + vpmvlzb + vpmvnzb + vpmvzb + vpor + vpperm + vprefetch + vprefetchnta + vprefetcht0 + vprefetcht1 + vprefetcht2 + vprefetchw + vprotb + vprotd + vprotq + vprotw + vpsadbw + vpshab + vpshad + vpshaq + vpshaw + vpshlb + vpshld + vpshlq + vpshlw + vpshufb + vpshufd + vpshufhw + vpshuflw + vpshufw + vpsignb + vpsignd + vpsignw + vpslld + vpslldq + vpsllq + vpsllvd + vpsllvq + vpsllw + vpsrad + vpsravd + vpsraw + vpsrld + vpsrldq + vpsrlq + vpsrlvd + vpsrlvq + vpsrlw + vpsubb + vpsubd + vpsubq + vpsubsb + vpsubsiw + vpsubsw + vpsubusb + vpsubusw + vpsubw + vpswapd + vptest + vpunpckhbw + vpunpckhdq + vpunpckhqdq + vpunpckhwd + vpunpcklbw + vpunpckldq + vpunpcklqdq + vpunpcklwd + vpxor + vrcpps + vroundpd + vroundps + vrsqrtps + vsqrtpd + vsqrtps + vstmxcsr + vtestpd + vtestps + vzeroall + vzeroupper + wait + wbinvd + wrfsbase + wrgsbase + wrmsr + wrmsrq + wrshr + xabort + xacquire + xadd + xbegin + xbts + xchg + xend + xgetbv + xlat + xlatb + xor + xorpd + xorps + xrelease + xrstor64 + xrstor + xsave64 + xsave + xsaveopt64 + xsaveopt + xsetbv + xtest + + + + rep + repe + repz + repne + repnz + + + + used + defined + + mod + and + or + xor + not + shl + shr + bsf + bsr + rva + plt + + far + near + short + + + + + db + dw + du + dd + dp + df + dq + dt + + rb + rw + rd + rp + rf + rq + rt + + file + + byte + word + dword + fword + pword + qword + tbyte + tword + dqword + xword + qqword + yword + dqqword + zword + ptr + + + + assert + append + at + break + calminstruction + common + display + else + end + equ + err + fix + foward + if + iterate + irp + irps + label + local + match + macro + postpone + purge + repeat + rept + reverse + restore + restruc + struc + times + while + virtual + namespace + + + + align + entry + extrn + format + include + invoke + data + load + from + heap + org + proc + public + section + segment + stack + store + use16 + use32 + use64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/fortran-fixed.xml b/syntax/fortran-fixed.xml new file mode 100644 --- /dev/null +++ b/syntax/fortran-fixed.xml @@ -0,0 +1,592 @@ + + + + + + + + + + + + allocate + break + call + common + continue + cycle + deallocate + forall + where + elsewhere + equivalence + exit + external + for + go + goto + if + implicit + include + interface + intrinsic + namelist + none + nullify + operator + assignment + pause + procedure + pure + elemental + record + recursive + result + return + stop + to + use + only + entry + while + + + + access + backspace + close + inquire + open + print + read + rewind + write + format + + + + unit + end + err + fmt + iostat + status + advance + size + eor + + + + unit + iostat + err + file + status + access + form + recl + blank + position + action + delim + pad + + + + unit + iostat + err + file + exist + opened + number + named + name + access + sequential + direct + form + formatted + unformatted + recl + nextrec + blank + position + action + read + write + readwrite + delim + pad + + + parameter + save + pointer + public + private + target + allocatable + optional + sequence + + + + + + + + + abs + cabs + dabs + iabs + aimag + aint + dint + anint + dnint + ceiling + cmplx + dcmplx + dimag + floor + nint + idnint + int + idint + ifix + real + float + sngl + dble + dreal + aprime + dconjg + dfloat + ddmim + rand + + modulo + conjg + dprod + dim + ddim + idim + max + amax0 + amax1 + max0 + max1 + dmax1 + min + amin0 + amin1 + min0 + min1 + dmin1 + mod + amod + dmod + sign + dsign + isign + + acos + dacos + asin + dasin + atan + datan + atan2 + datan2 + cos + ccos + dcos + cosh + dcosh + exp + cexp + dexp + log + alog + dlog + clog + log10 + alog10 + dlog10 + sin + csin + dsin + sinh + dsinh + sqrt + csqrt + dsqrt + tan + dtan + tanh + dtanh + + + achar + char + iachar + ichar + + lge + lgt + lle + llt + + adjustl + adjustr + index + len_trim + scan + verify + + logical + + exponent + fraction + nearest + rrspacing + scale + set_exponent + spacing + + btest + iand + ibclr + ibits + ibset + ieor + ior + ishft + ishftc + not + + mvbits + + merge + + + + + + associated + present + kind + + len + + digits + epsilon + huge + maxexponent + minexponent + precision + radix + range + tiny + + bit_size + + allocated + lbound + ubound + shape + size + + + + + + repeat + trim + + selected_int_kind + selected_real_kind + + transfer + + dot_product + matmul + + all + any + count + maxval + minval + product + sum + + pack + unpack + + reshape + + spread + + cshift + eoshift + + transpose + + maxloc + minloc + + + + + + date_and_time + system_clock + + random_number + random_seed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/fortran-free.xml b/syntax/fortran-free.xml new file mode 100644 --- /dev/null +++ b/syntax/fortran-free.xml @@ -0,0 +1,311 @@ + + + + + + + + + + + + keywords##Fortran (Fixed Format) + associate + import + impure + + + io_functions##Fortran (Fixed Format) + + + + io_keywords##Fortran (Fixed Format) + + + + open_keywords##Fortran (Fixed Format) + + + + inquire_keywords##Fortran (Fixed Format) + + + types##Fortran (Fixed Format) + abstract + asynchronous + bind + contiguous + deferred + enum + enumerator + final + generic + nopass + non_overridable + protected + value + volatile + + + + + + + elemental_procs##Fortran (Fixed Format) + + acosh + asinh + atanh + bessel_j0 + bessel_j1 + bessel_jn + bessel_y0 + bessel_y1 + bessel_yn + erf + erfc + erfc_scaled + gamma + log_gamma + hypot + + + + + inquiry_fn##Fortran (Fixed Format) + + extends_type_of + same_type_as + storage_size + + lcobound + ucobound + image_index + + + + + transform_fn##Fortran (Fixed Format) + + selected_char_kind + + parity + iall + iany + iparity + + num_images + this_image + + + + + non_elem_subr##Fortran (Fixed Format) + + cpu_time + + execute_command_line + get_environment_variable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/fsharp.xml b/syntax/fsharp.xml --- a/syntax/fsharp.xml +++ b/syntax/fsharp.xml @@ -9,7 +9,7 @@ ]> - + @@ -190,11 +190,18 @@ - + + + + + + + + @@ -275,8 +282,7 @@ - - + diff --git a/syntax/glsl.xml b/syntax/glsl.xml --- a/syntax/glsl.xml +++ b/syntax/glsl.xml @@ -1,6 +1,6 @@ - + break @@ -176,11 +176,6 @@ readonly writeonly - - FIXME - TODO - BUG - abs @@ -1173,18 +1168,22 @@ - - + + - + + + - + + + @@ -1204,14 +1203,14 @@ - - + + diff --git a/syntax/gnuassembler.xml b/syntax/gnuassembler.xml --- a/syntax/gnuassembler.xml +++ b/syntax/gnuassembler.xml @@ -43,7 +43,7 @@ --> - + .abort @@ -250,16 +250,20 @@ - + + + - + + + @@ -293,11 +297,10 @@ - - + + + diff --git a/syntax/go.xml b/syntax/go.xml --- a/syntax/go.xml +++ b/syntax/go.xml @@ -26,7 +26,7 @@ --> - + @@ -111,7 +111,7 @@ - + @@ -126,6 +126,7 @@ + @@ -133,6 +134,7 @@ + @@ -173,3 +175,4 @@ + diff --git a/syntax/graphql.xml b/syntax/graphql.xml new file mode 100644 --- /dev/null +++ b/syntax/graphql.xml @@ -0,0 +1,91 @@ + + + + + + + enum + extend + fragment + implements + input + interface + mutation + on + query + scalar + schema + subscription + type + union + + + null + true + false + + + Boolean + Float + ID + Int + String + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/groovy.xml b/syntax/groovy.xml new file mode 100644 --- /dev/null +++ b/syntax/groovy.xml @@ -0,0 +1,3894 @@ + + + + + + + ACTIVE + ACTIVITY_COMPLETED + ACTIVITY_REQUIRED + ARG_IN + ARG_INOUT + ARG_OUT + AWTError + AWTEvent + AWTEventListener + AWTEventListenerProxy + AWTEventMulticaster + AWTException + AWTKeyStroke + AWTPermission + AbstractAction + AbstractBorder + AbstractButton + AbstractCellEditor + AbstractCollection + AbstractColorChooserPanel + AbstractDocument + AbstractDocument.AttributeContext + AbstractDocument.Content + AbstractDocument.ElementEdit + AbstractExecutorService + AbstractInterruptibleChannel + AbstractLayoutCache + AbstractLayoutCache.NodeDimensions + AbstractList + AbstractListModel + AbstractMap + AbstractMethodError + AbstractPreferences + AbstractQueue + AbstractQueuedSynchronizer + AbstractSelectableChannel + AbstractSelectionKey + AbstractSelector + AbstractSequentialList + AbstractSet + AbstractSpinnerModel + AbstractTableModel + AbstractUndoableEdit + AbstractWriter + AccessControlContext + AccessControlException + AccessController + AccessException + Accessible + AccessibleAction + AccessibleAttributeSequence + AccessibleBundle + AccessibleComponent + AccessibleContext + AccessibleEditableText + AccessibleExtendedComponent + AccessibleExtendedTable + AccessibleExtendedText + AccessibleHyperlink + AccessibleHypertext + AccessibleIcon + AccessibleKeyBinding + AccessibleObject + AccessibleRelation + AccessibleRelationSet + AccessibleResourceBundle + AccessibleRole + AccessibleSelection + AccessibleState + AccessibleStateSet + AccessibleStreamable + AccessibleTable + AccessibleTableModelChange + AccessibleText + AccessibleTextSequence + AccessibleValue + AccountException + AccountExpiredException + AccountLockedException + AccountNotFoundException + Acl + AclEntry + AclNotFoundException + Action + ActionEvent + ActionListener + ActionMap + ActionMapUIResource + Activatable + ActivateFailedException + ActivationDesc + ActivationException + ActivationGroup + ActivationGroupDesc + ActivationGroupDesc.CommandEnvironment + ActivationGroupID + ActivationGroup_Stub + ActivationID + ActivationInstantiator + ActivationMonitor + ActivationSystem + Activator + ActiveEvent + ActivityCompletedException + ActivityRequiredException + AdapterActivator + AdapterActivatorOperations + AdapterAlreadyExists + AdapterAlreadyExistsHelper + AdapterInactive + AdapterInactiveHelper + AdapterManagerIdHelper + AdapterNameHelper + AdapterNonExistent + AdapterNonExistentHelper + AdapterStateHelper + AddressHelper + Adjustable + AdjustmentEvent + AdjustmentListener + Adler32 + AffineTransform + AffineTransformOp + AlgorithmParameterGenerator + AlgorithmParameterGeneratorSpi + AlgorithmParameterSpec + AlgorithmParameters + AlgorithmParametersSpi + AllPermission + AlphaComposite + AlreadyBound + AlreadyBoundException + AlreadyBoundHelper + AlreadyBoundHolder + AlreadyConnectedException + AncestorEvent + AncestorListener + AnnotatedElement + Annotation + Annotation + AnnotationFormatError + AnnotationTypeMismatchException + Any + AnyHolder + AnySeqHelper + AnySeqHelper + AnySeqHolder + AppConfigurationEntry + AppConfigurationEntry.LoginModuleControlFlag + Appendable + Applet + AppletContext + AppletInitializer + AppletStub + ApplicationException + Arc2D + Arc2D.Double + Arc2D.Float + Area + AreaAveragingScaleFilter + ArithmeticException + Array + Array + ArrayBlockingQueue + ArrayIndexOutOfBoundsException + ArrayList + ArrayStoreException + ArrayType + Arrays + AssertionError + AsyncBoxView + AsynchronousCloseException + AtomicBoolean + AtomicInteger + AtomicIntegerArray + AtomicIntegerFieldUpdater + AtomicLong + AtomicLongArray + AtomicLongFieldUpdater + AtomicMarkableReference + AtomicReference + AtomicReferenceArray + AtomicReferenceFieldUpdater + AtomicStampedReference + Attr + Attribute + Attribute + Attribute + AttributeChangeNotification + AttributeChangeNotificationFilter + AttributeException + AttributeInUseException + AttributeList + AttributeList + AttributeList + AttributeListImpl + AttributeModificationException + AttributeNotFoundException + AttributeSet + AttributeSet + AttributeSet.CharacterAttribute + AttributeSet.ColorAttribute + AttributeSet.FontAttribute + AttributeSet.ParagraphAttribute + AttributeSetUtilities + AttributeValueExp + AttributedCharacterIterator + AttributedCharacterIterator.Attribute + AttributedString + Attributes + Attributes + Attributes + Attributes.Name + Attributes2 + Attributes2Impl + AttributesImpl + AudioClip + AudioFileFormat + AudioFileFormat.Type + AudioFileReader + AudioFileWriter + AudioFormat + AudioFormat.Encoding + AudioInputStream + AudioPermission + AudioSystem + AuthPermission + AuthProvider + AuthenticationException + AuthenticationException + AuthenticationNotSupportedException + Authenticator + Authenticator.RequestorType + AuthorizeCallback + Autoscroll + BAD_CONTEXT + BAD_INV_ORDER + BAD_OPERATION + BAD_PARAM + BAD_POLICY + BAD_POLICY_TYPE + BAD_POLICY_VALUE + BAD_QOS + BAD_TYPECODE + BMPImageWriteParam + BackingStoreException + BadAttributeValueExpException + BadBinaryOpValueExpException + BadKind + BadLocationException + BadPaddingException + BadStringOperationException + BandCombineOp + BandedSampleModel + BaseRowSet + BasicArrowButton + BasicAttribute + BasicAttributes + BasicBorders + BasicBorders.ButtonBorder + BasicBorders.FieldBorder + BasicBorders.MarginBorder + BasicBorders.MenuBarBorder + BasicBorders.RadioButtonBorder + BasicBorders.RolloverButtonBorder + BasicBorders.SplitPaneBorder + BasicBorders.ToggleButtonBorder + BasicButtonListener + BasicButtonUI + BasicCheckBoxMenuItemUI + BasicCheckBoxUI + BasicColorChooserUI + BasicComboBoxEditor + BasicComboBoxEditor.UIResource + BasicComboBoxRenderer + BasicComboBoxRenderer.UIResource + BasicComboBoxUI + BasicComboPopup + BasicControl + BasicDesktopIconUI + BasicDesktopPaneUI + BasicDirectoryModel + BasicEditorPaneUI + BasicFileChooserUI + BasicFormattedTextFieldUI + BasicGraphicsUtils + BasicHTML + BasicIconFactory + BasicInternalFrameTitlePane + BasicInternalFrameUI + BasicLabelUI + BasicListUI + BasicLookAndFeel + BasicMenuBarUI + BasicMenuItemUI + BasicMenuUI + BasicOptionPaneUI + BasicOptionPaneUI.ButtonAreaLayout + BasicPanelUI + BasicPasswordFieldUI + BasicPermission + BasicPopupMenuSeparatorUI + BasicPopupMenuUI + BasicProgressBarUI + BasicRadioButtonMenuItemUI + BasicRadioButtonUI + BasicRootPaneUI + BasicScrollBarUI + BasicScrollPaneUI + BasicSeparatorUI + BasicSliderUI + BasicSpinnerUI + BasicSplitPaneDivider + BasicSplitPaneUI + BasicStroke + BasicTabbedPaneUI + BasicTableHeaderUI + BasicTableUI + BasicTextAreaUI + BasicTextFieldUI + BasicTextPaneUI + BasicTextUI + BasicTextUI.BasicCaret + BasicTextUI.BasicHighlighter + BasicToggleButtonUI + BasicToolBarSeparatorUI + BasicToolBarUI + BasicToolTipUI + BasicTreeUI + BasicViewportUI + BatchUpdateException + BeanContext + BeanContextChild + BeanContextChildComponentProxy + BeanContextChildSupport + BeanContextContainerProxy + BeanContextEvent + BeanContextMembershipEvent + BeanContextMembershipListener + BeanContextProxy + BeanContextServiceAvailableEvent + BeanContextServiceProvider + BeanContextServiceProviderBeanInfo + BeanContextServiceRevokedEvent + BeanContextServiceRevokedListener + BeanContextServices + BeanContextServicesListener + BeanContextServicesSupport + BeanContextServicesSupport.BCSSServiceProvider + BeanContextSupport + BeanContextSupport.BCSIterator + BeanDescriptor + BeanInfo + Beans + BevelBorder + Bidi + BigDecimal + BigInteger + BinaryRefAddr + BindException + Binding + Binding + BindingHelper + BindingHolder + BindingIterator + BindingIteratorHelper + BindingIteratorHolder + BindingIteratorOperations + BindingIteratorPOA + BindingListHelper + BindingListHolder + BindingType + BindingTypeHelper + BindingTypeHolder + BitSet + Blob + BlockView + BlockingQueue + Book + Boolean + BooleanControl + BooleanControl.Type + BooleanHolder + BooleanSeqHelper + BooleanSeqHolder + Border + BorderFactory + BorderLayout + BorderUIResource + BorderUIResource.BevelBorderUIResource + BorderUIResource.CompoundBorderUIResource + BorderUIResource.EmptyBorderUIResource + BorderUIResource.EtchedBorderUIResource + BorderUIResource.LineBorderUIResource + BorderUIResource.MatteBorderUIResource + BorderUIResource.TitledBorderUIResource + BoundedRangeModel + Bounds + Bounds + Box + Box.Filler + BoxLayout + BoxView + BoxedValueHelper + BreakIterator + BrokenBarrierException + Buffer + BufferCapabilities + BufferCapabilities.FlipContents + BufferOverflowException + BufferStrategy + BufferUnderflowException + BufferedImage + BufferedImageFilter + BufferedImageOp + BufferedInputStream + BufferedOutputStream + BufferedReader + BufferedWriter + Button + ButtonGroup + ButtonModel + ButtonUI + Byte + ByteArrayInputStream + ByteArrayOutputStream + ByteBuffer + ByteChannel + ByteHolder + ByteLookupTable + ByteOrder + CDATASection + CMMException + CODESET_INCOMPATIBLE + COMM_FAILURE + CRC32 + CRL + CRLException + CRLSelector + CSS + CSS.Attribute + CTX_RESTRICT_SCOPE + CacheRequest + CacheResponse + CachedRowSet + Calendar + Callable + CallableStatement + Callback + CallbackHandler + CancelablePrintJob + CancellationException + CancelledKeyException + CannotProceed + CannotProceedException + CannotProceedHelper + CannotProceedHolder + CannotRedoException + CannotUndoException + Canvas + CardLayout + Caret + CaretEvent + CaretListener + CellEditor + CellEditorListener + CellRendererPane + CertPath + CertPath.CertPathRep + CertPathBuilder + CertPathBuilderException + CertPathBuilderResult + CertPathBuilderSpi + CertPathParameters + CertPathTrustManagerParameters + CertPathValidator + CertPathValidatorException + CertPathValidatorResult + CertPathValidatorSpi + CertSelector + CertStore + CertStoreException + CertStoreParameters + CertStoreSpi + Certificate + Certificate + Certificate + Certificate.CertificateRep + CertificateEncodingException + CertificateEncodingException + CertificateException + CertificateException + CertificateExpiredException + CertificateExpiredException + CertificateFactory + CertificateFactorySpi + CertificateNotYetValidException + CertificateNotYetValidException + CertificateParsingException + CertificateParsingException + ChangeEvent + ChangeListener + ChangedCharSetException + Channel + ChannelBinding + Channels + CharArrayReader + CharArrayWriter + CharBuffer + CharConversionException + CharHolder + CharSeqHelper + CharSeqHolder + CharSequence + Character + Character.Subset + Character.UnicodeBlock + CharacterCodingException + CharacterData + CharacterIterator + Charset + CharsetDecoder + CharsetEncoder + CharsetProvider + Checkbox + CheckboxGroup + CheckboxMenuItem + CheckedInputStream + CheckedOutputStream + Checksum + Choice + ChoiceCallback + ChoiceFormat + Chromaticity + Cipher + CipherInputStream + CipherOutputStream + CipherSpi + Class + ClassCastException + ClassCircularityError + ClassDefinition + ClassDesc + ClassFileTransformer + ClassFormatError + ClassLoader + ClassLoaderRepository + ClassLoadingMXBean + ClassNotFoundException + ClientRequestInfo + ClientRequestInfoOperations + ClientRequestInterceptor + ClientRequestInterceptorOperations + Clip + Clipboard + ClipboardOwner + Clob + CloneNotSupportedException + Cloneable + Closeable + ClosedByInterruptException + ClosedChannelException + ClosedSelectorException + CodeSets + CodeSigner + CodeSource + Codec + CodecFactory + CodecFactoryHelper + CodecFactoryOperations + CodecOperations + CoderMalfunctionError + CoderResult + CodingErrorAction + CollationElementIterator + CollationKey + Collator + Collection + CollectionCertStoreParameters + Collections + Color + ColorChooserComponentFactory + ColorChooserUI + ColorConvertOp + ColorModel + ColorSelectionModel + ColorSpace + ColorSupported + ColorType + ColorUIResource + ComboBoxEditor + ComboBoxModel + ComboBoxUI + ComboPopup + Comment + CommunicationException + Comparable + Comparator + CompilationMXBean + Compiler + CompletionService + CompletionStatus + CompletionStatusHelper + Component + ComponentAdapter + ComponentColorModel + ComponentEvent + ComponentIdHelper + ComponentInputMap + ComponentInputMapUIResource + ComponentListener + ComponentOrientation + ComponentSampleModel + ComponentUI + ComponentView + Composite + CompositeContext + CompositeData + CompositeDataSupport + CompositeName + CompositeType + CompositeView + CompoundBorder + CompoundControl + CompoundControl.Type + CompoundEdit + CompoundName + Compression + ConcurrentHashMap + ConcurrentLinkedQueue + ConcurrentMap + ConcurrentModificationException + Condition + Configuration + ConfigurationException + ConfirmationCallback + ConnectException + ConnectException + ConnectIOException + Connection + ConnectionEvent + ConnectionEventListener + ConnectionPendingException + ConnectionPoolDataSource + ConsoleHandler + Constructor + Container + ContainerAdapter + ContainerEvent + ContainerListener + ContainerOrderFocusTraversalPolicy + ContentHandler + ContentHandler + ContentHandlerFactory + ContentModel + Context + Context + ContextList + ContextNotEmptyException + ContextualRenderedImageFactory + Control + Control + Control.Type + ControlFactory + ControllerEventListener + ConvolveOp + CookieHandler + CookieHolder + Copies + CopiesSupported + CopyOnWriteArrayList + CopyOnWriteArraySet + CountDownLatch + CounterMonitor + CounterMonitorMBean + CredentialException + CredentialExpiredException + CredentialNotFoundException + CropImageFilter + CubicCurve2D + CubicCurve2D.Double + CubicCurve2D.Float + Currency + Current + Current + Current + CurrentHelper + CurrentHelper + CurrentHelper + CurrentHolder + CurrentOperations + CurrentOperations + CurrentOperations + Cursor + CustomMarshal + CustomValue + Customizer + CyclicBarrier + DATA_CONVERSION + DESKeySpec + DESedeKeySpec + DGC + DHGenParameterSpec + DHKey + DHParameterSpec + DHPrivateKey + DHPrivateKeySpec + DHPublicKey + DHPublicKeySpec + DISCARDING + DOMConfiguration + DOMError + DOMErrorHandler + DOMException + DOMImplementation + DOMImplementationLS + DOMImplementationList + DOMImplementationRegistry + DOMImplementationSource + DOMLocator + DOMLocator + DOMResult + DOMSource + DOMStringList + DSAKey + DSAKeyPairGenerator + DSAParameterSpec + DSAParams + DSAPrivateKey + DSAPrivateKeySpec + DSAPublicKey + DSAPublicKeySpec + DTD + DTDConstants + DTDHandler + DataBuffer + DataBufferByte + DataBufferDouble + DataBufferFloat + DataBufferInt + DataBufferShort + DataBufferUShort + DataFlavor + DataFormatException + DataInput + DataInputStream + DataInputStream + DataLine + DataLine.Info + DataOutput + DataOutputStream + DataOutputStream + DataSource + DataTruncation + DatabaseMetaData + DatagramChannel + DatagramPacket + DatagramSocket + DatagramSocketImpl + DatagramSocketImplFactory + DatatypeConfigurationException + DatatypeConstants + DatatypeConstants.Field + DatatypeFactory + Date + Date + DateFormat + DateFormat.Field + DateFormatSymbols + DateFormatter + DateTimeAtCompleted + DateTimeAtCreation + DateTimeAtProcessing + DateTimeSyntax + DebugGraphics + DecimalFormat + DecimalFormatSymbols + DeclHandler + DefaultBoundedRangeModel + DefaultButtonModel + DefaultCaret + DefaultCellEditor + DefaultColorSelectionModel + DefaultComboBoxModel + DefaultDesktopManager + DefaultEditorKit + DefaultEditorKit.BeepAction + DefaultEditorKit.CopyAction + DefaultEditorKit.CutAction + DefaultEditorKit.DefaultKeyTypedAction + DefaultEditorKit.InsertBreakAction + DefaultEditorKit.InsertContentAction + DefaultEditorKit.InsertTabAction + DefaultEditorKit.PasteAction + DefaultFocusManager + DefaultFocusTraversalPolicy + DefaultFormatter + DefaultFormatterFactory + DefaultHandler + DefaultHandler2 + DefaultHighlighter + DefaultHighlighter.DefaultHighlightPainter + DefaultKeyboardFocusManager + DefaultListCellRenderer + DefaultListCellRenderer.UIResource + DefaultListModel + DefaultListSelectionModel + DefaultLoaderRepository + DefaultLoaderRepository + DefaultMenuLayout + DefaultMetalTheme + DefaultMutableTreeNode + DefaultPersistenceDelegate + DefaultSingleSelectionModel + DefaultStyledDocument + DefaultStyledDocument.AttributeUndoableEdit + DefaultStyledDocument.ElementSpec + DefaultTableCellRenderer + DefaultTableCellRenderer.UIResource + DefaultTableColumnModel + DefaultTableModel + DefaultTextUI + DefaultTreeCellEditor + DefaultTreeCellRenderer + DefaultTreeModel + DefaultTreeSelectionModel + DefinitionKind + DefinitionKindHelper + Deflater + DeflaterOutputStream + DelayQueue + Delayed + Delegate + Delegate + Delegate + DelegationPermission + Deprecated + Descriptor + DescriptorAccess + DescriptorSupport + DesignMode + DesktopIconUI + DesktopManager + DesktopPaneUI + Destination + DestroyFailedException + Destroyable + Dialog + Dictionary + DigestException + DigestInputStream + DigestOutputStream + Dimension + Dimension2D + DimensionUIResource + DirContext + DirObjectFactory + DirStateFactory + DirStateFactory.Result + DirectColorModel + DirectoryManager + DisplayMode + DnDConstants + Doc + DocAttribute + DocAttributeSet + DocFlavor + DocFlavor.BYTE_ARRAY + DocFlavor.CHAR_ARRAY + DocFlavor.INPUT_STREAM + DocFlavor.READER + DocFlavor.SERVICE_FORMATTED + DocFlavor.STRING + DocFlavor.URL + DocPrintJob + Document + Document + DocumentBuilder + DocumentBuilderFactory + DocumentEvent + DocumentEvent.ElementChange + DocumentEvent.EventType + DocumentFilter + DocumentFilter.FilterBypass + DocumentFragment + DocumentHandler + DocumentListener + DocumentName + DocumentParser + DocumentType + Documented + DomainCombiner + DomainManager + DomainManagerOperations + Double + DoubleBuffer + DoubleHolder + DoubleSeqHelper + DoubleSeqHolder + DragGestureEvent + DragGestureListener + DragGestureRecognizer + DragSource + DragSourceAdapter + DragSourceContext + DragSourceDragEvent + DragSourceDropEvent + DragSourceEvent + DragSourceListener + DragSourceMotionListener + Driver + DriverManager + DriverPropertyInfo + DropTarget + DropTarget.DropTargetAutoScroller + DropTargetAdapter + DropTargetContext + DropTargetDragEvent + DropTargetDropEvent + DropTargetEvent + DropTargetListener + DuplicateFormatFlagsException + DuplicateName + DuplicateNameHelper + Duration + DynAny + DynAny + DynAnyFactory + DynAnyFactoryHelper + DynAnyFactoryOperations + DynAnyHelper + DynAnyOperations + DynAnySeqHelper + DynArray + DynArray + DynArrayHelper + DynArrayOperations + DynEnum + DynEnum + DynEnumHelper + DynEnumOperations + DynFixed + DynFixed + DynFixedHelper + DynFixedOperations + DynSequence + DynSequence + DynSequenceHelper + DynSequenceOperations + DynStruct + DynStruct + DynStructHelper + DynStructOperations + DynUnion + DynUnion + DynUnionHelper + DynUnionOperations + DynValue + DynValue + DynValueBox + DynValueBoxOperations + DynValueCommon + DynValueCommonOperations + DynValueHelper + DynValueOperations + DynamicImplementation + DynamicImplementation + DynamicMBean + ECField + ECFieldF2m + ECFieldFp + ECGenParameterSpec + ECKey + ECParameterSpec + ECPoint + ECPrivateKey + ECPrivateKeySpec + ECPublicKey + ECPublicKeySpec + ENCODING_CDR_ENCAPS + EOFException + EditorKit + Element + Element + Element + ElementIterator + ElementType + Ellipse2D + Ellipse2D.Double + Ellipse2D.Float + EllipticCurve + EmptyBorder + EmptyStackException + EncodedKeySpec + Encoder + Encoding + EncryptedPrivateKeyInfo + Entity + Entity + EntityReference + EntityResolver + EntityResolver2 + Enum + EnumConstantNotPresentException + EnumControl + EnumControl.Type + EnumMap + EnumSet + EnumSyntax + Enumeration + Environment + Error + ErrorHandler + ErrorListener + ErrorManager + EtchedBorder + Event + EventContext + EventDirContext + EventHandler + EventListener + EventListenerList + EventListenerProxy + EventObject + EventQueue + EventSetDescriptor + Exception + ExceptionDetailMessage + ExceptionInInitializerError + ExceptionList + ExceptionListener + Exchanger + ExecutionException + Executor + ExecutorCompletionService + ExecutorService + Executors + ExemptionMechanism + ExemptionMechanismException + ExemptionMechanismSpi + ExpandVetoException + ExportException + Expression + ExtendedRequest + ExtendedResponse + Externalizable + FREE_MEM + FactoryConfigurationError + FailedLoginException + FeatureDescriptor + Fidelity + Field + FieldNameHelper + FieldNameHelper + FieldPosition + FieldView + File + FileCacheImageInputStream + FileCacheImageOutputStream + FileChannel + FileChannel.MapMode + FileChooserUI + FileDescriptor + FileDialog + FileFilter + FileFilter + FileHandler + FileImageInputStream + FileImageOutputStream + FileInputStream + FileLock + FileLockInterruptionException + FileNameMap + FileNotFoundException + FileOutputStream + FilePermission + FileReader + FileSystemView + FileView + FileWriter + FilenameFilter + Filter + FilterInputStream + FilterOutputStream + FilterReader + FilterWriter + FilteredImageSource + FilteredRowSet + Finishings + FixedHeightLayoutCache + FixedHolder + FlatteningPathIterator + FlavorEvent + FlavorException + FlavorListener + FlavorMap + FlavorTable + Float + FloatBuffer + FloatControl + FloatControl.Type + FloatHolder + FloatSeqHelper + FloatSeqHolder + FlowLayout + FlowView + FlowView.FlowStrategy + Flushable + FocusAdapter + FocusEvent + FocusListener + FocusManager + FocusTraversalPolicy + Font + FontFormatException + FontMetrics + FontRenderContext + FontUIResource + FormSubmitEvent + FormSubmitEvent.MethodType + FormView + Format + Format.Field + FormatConversionProvider + FormatFlagsConversionMismatchException + FormatMismatch + FormatMismatchHelper + Formattable + FormattableFlags + Formatter + Formatter + FormatterClosedException + ForwardRequest + ForwardRequest + ForwardRequestHelper + ForwardRequestHelper + Frame + Future + FutureTask + GSSContext + GSSCredential + GSSException + GSSManager + GSSName + GZIPInputStream + GZIPOutputStream + GapContent + GarbageCollectorMXBean + GatheringByteChannel + GaugeMonitor + GaugeMonitorMBean + GeneralPath + GeneralSecurityException + GenericArrayType + GenericDeclaration + GenericSignatureFormatError + GlyphJustificationInfo + GlyphMetrics + GlyphVector + GlyphView + GlyphView.GlyphPainter + GradientPaint + GraphicAttribute + Graphics + Graphics2D + GraphicsConfigTemplate + GraphicsConfiguration + GraphicsDevice + GraphicsEnvironment + GrayFilter + GregorianCalendar + GridBagConstraints + GridBagLayout + GridLayout + Group + Guard + GuardedObject + HOLDING + HTML + HTML.Attribute + HTML.Tag + HTML.UnknownTag + HTMLDocument + HTMLDocument.Iterator + HTMLEditorKit + HTMLEditorKit.HTMLFactory + HTMLEditorKit.HTMLTextAction + HTMLEditorKit.InsertHTMLTextAction + HTMLEditorKit.LinkController + HTMLEditorKit.Parser + HTMLEditorKit.ParserCallback + HTMLFrameHyperlinkEvent + HTMLWriter + Handler + HandlerBase + HandshakeCompletedEvent + HandshakeCompletedListener + HasControls + HashAttributeSet + HashDocAttributeSet + HashMap + HashPrintJobAttributeSet + HashPrintRequestAttributeSet + HashPrintServiceAttributeSet + HashSet + Hashtable + HeadlessException + HierarchyBoundsAdapter + HierarchyBoundsListener + HierarchyEvent + HierarchyListener + Highlighter + Highlighter.Highlight + Highlighter.HighlightPainter + HostnameVerifier + HttpRetryException + HttpURLConnection + HttpsURLConnection + HyperlinkEvent + HyperlinkEvent.EventType + HyperlinkListener + ICC_ColorSpace + ICC_Profile + ICC_ProfileGray + ICC_ProfileRGB + IDLEntity + IDLType + IDLTypeHelper + IDLTypeOperations + ID_ASSIGNMENT_POLICY_ID + ID_UNIQUENESS_POLICY_ID + IIOByteBuffer + IIOException + IIOImage + IIOInvalidTreeException + IIOMetadata + IIOMetadataController + IIOMetadataFormat + IIOMetadataFormatImpl + IIOMetadataNode + IIOParam + IIOParamController + IIOReadProgressListener + IIOReadUpdateListener + IIOReadWarningListener + IIORegistry + IIOServiceProvider + IIOWriteProgressListener + IIOWriteWarningListener + IMPLICIT_ACTIVATION_POLICY_ID + IMP_LIMIT + INACTIVE + INITIALIZE + INTERNAL + INTF_REPOS + INVALID_ACTIVITY + INVALID_TRANSACTION + INV_FLAG + INV_IDENT + INV_OBJREF + INV_POLICY + IOException + IOR + IORHelper + IORHolder + IORInfo + IORInfoOperations + IORInterceptor + IORInterceptorOperations + IORInterceptor_3_0 + IORInterceptor_3_0Helper + IORInterceptor_3_0Holder + IORInterceptor_3_0Operations + IRObject + IRObjectOperations + Icon + IconUIResource + IconView + IdAssignmentPolicy + IdAssignmentPolicyOperations + IdAssignmentPolicyValue + IdUniquenessPolicy + IdUniquenessPolicyOperations + IdUniquenessPolicyValue + IdentifierHelper + Identity + IdentityHashMap + IdentityScope + IllegalAccessError + IllegalAccessException + IllegalArgumentException + IllegalBlockSizeException + IllegalBlockingModeException + IllegalCharsetNameException + IllegalClassFormatException + IllegalComponentStateException + IllegalFormatCodePointException + IllegalFormatConversionException + IllegalFormatException + IllegalFormatFlagsException + IllegalFormatPrecisionException + IllegalFormatWidthException + IllegalMonitorStateException + IllegalPathStateException + IllegalSelectorException + IllegalStateException + IllegalThreadStateException + Image + ImageCapabilities + ImageConsumer + ImageFilter + ImageGraphicAttribute + ImageIO + ImageIcon + ImageInputStream + ImageInputStreamImpl + ImageInputStreamSpi + ImageObserver + ImageOutputStream + ImageOutputStreamImpl + ImageOutputStreamSpi + ImageProducer + ImageReadParam + ImageReader + ImageReaderSpi + ImageReaderWriterSpi + ImageTranscoder + ImageTranscoderSpi + ImageTypeSpecifier + ImageView + ImageWriteParam + ImageWriter + ImageWriterSpi + ImagingOpException + ImplicitActivationPolicy + ImplicitActivationPolicyOperations + ImplicitActivationPolicyValue + IncompatibleClassChangeError + IncompleteAnnotationException + InconsistentTypeCode + InconsistentTypeCode + InconsistentTypeCodeHelper + IndexColorModel + IndexOutOfBoundsException + IndexedPropertyChangeEvent + IndexedPropertyDescriptor + IndirectionException + Inet4Address + Inet6Address + InetAddress + InetSocketAddress + Inflater + InflaterInputStream + InheritableThreadLocal + Inherited + InitialContext + InitialContextFactory + InitialContextFactoryBuilder + InitialDirContext + InitialLdapContext + InlineView + InputContext + InputEvent + InputMap + InputMapUIResource + InputMethod + InputMethodContext + InputMethodDescriptor + InputMethodEvent + InputMethodHighlight + InputMethodListener + InputMethodRequests + InputMismatchException + InputSource + InputStream + InputStream + InputStream + InputStreamReader + InputSubset + InputVerifier + Insets + InsetsUIResource + InstanceAlreadyExistsException + InstanceNotFoundException + InstantiationError + InstantiationException + Instrument + Instrumentation + InsufficientResourcesException + IntBuffer + IntHolder + Integer + IntegerSyntax + Interceptor + InterceptorOperations + InternalError + InternalFrameAdapter + InternalFrameEvent + InternalFrameFocusTraversalPolicy + InternalFrameListener + InternalFrameUI + InternationalFormatter + InterruptedException + InterruptedIOException + InterruptedNamingException + InterruptibleChannel + IntrospectionException + IntrospectionException + Introspector + Invalid + InvalidActivityException + InvalidAddress + InvalidAddressHelper + InvalidAddressHolder + InvalidAlgorithmParameterException + InvalidApplicationException + InvalidAttributeIdentifierException + InvalidAttributeValueException + InvalidAttributeValueException + InvalidAttributesException + InvalidClassException + InvalidDnDOperationException + InvalidKeyException + InvalidKeyException + InvalidKeySpecException + InvalidMarkException + InvalidMidiDataException + InvalidName + InvalidName + InvalidName + InvalidNameException + InvalidNameHelper + InvalidNameHelper + InvalidNameHolder + InvalidObjectException + InvalidOpenTypeException + InvalidParameterException + InvalidParameterSpecException + InvalidPolicy + InvalidPolicyHelper + InvalidPreferencesFormatException + InvalidPropertiesFormatException + InvalidRelationIdException + InvalidRelationServiceException + InvalidRelationTypeException + InvalidRoleInfoException + InvalidRoleValueException + InvalidSearchControlsException + InvalidSearchFilterException + InvalidSeq + InvalidSlot + InvalidSlotHelper + InvalidTargetObjectTypeException + InvalidTransactionException + InvalidTypeForEncoding + InvalidTypeForEncodingHelper + InvalidValue + InvalidValue + InvalidValueHelper + InvocationEvent + InvocationHandler + InvocationTargetException + InvokeHandler + IstringHelper + ItemEvent + ItemListener + ItemSelectable + Iterable + Iterator + IvParameterSpec + JApplet + JButton + JCheckBox + JCheckBoxMenuItem + JColorChooser + JComboBox + JComboBox.KeySelectionManager + JComponent + JDesktopPane + JDialog + JEditorPane + JFileChooser + JFormattedTextField + JFormattedTextField.AbstractFormatter + JFormattedTextField.AbstractFormatterFactory + JFrame + JInternalFrame + JInternalFrame.JDesktopIcon + JLabel + JLayeredPane + JList + JMException + JMRuntimeException + JMXAuthenticator + JMXConnectionNotification + JMXConnector + JMXConnectorFactory + JMXConnectorProvider + JMXConnectorServer + JMXConnectorServerFactory + JMXConnectorServerMBean + JMXConnectorServerProvider + JMXPrincipal + JMXProviderException + JMXServerErrorException + JMXServiceURL + JMenu + JMenuBar + JMenuItem + JOptionPane + JPEGHuffmanTable + JPEGImageReadParam + JPEGImageWriteParam + JPEGQTable + JPanel + JPasswordField + JPopupMenu + JPopupMenu.Separator + JProgressBar + JRadioButton + JRadioButtonMenuItem + JRootPane + JScrollBar + JScrollPane + JSeparator + JSlider + JSpinner + JSpinner.DateEditor + JSpinner.DefaultEditor + JSpinner.ListEditor + JSpinner.NumberEditor + JSplitPane + JTabbedPane + JTable + JTable.PrintMode + JTableHeader + JTextArea + JTextComponent + JTextComponent.KeyBinding + JTextField + JTextPane + JToggleButton + JToggleButton.ToggleButtonModel + JToolBar + JToolBar.Separator + JToolTip + JTree + JTree.DynamicUtilTreeNode + JTree.EmptySelectionModel + JViewport + JWindow + JarEntry + JarException + JarFile + JarInputStream + JarOutputStream + JarURLConnection + JdbcRowSet + JobAttributes + JobAttributes.DefaultSelectionType + JobAttributes.DestinationType + JobAttributes.DialogType + JobAttributes.MultipleDocumentHandlingType + JobAttributes.SidesType + JobHoldUntil + JobImpressions + JobImpressionsCompleted + JobImpressionsSupported + JobKOctets + JobKOctetsProcessed + JobKOctetsSupported + JobMediaSheets + JobMediaSheetsCompleted + JobMediaSheetsSupported + JobMessageFromOperator + JobName + JobOriginatingUserName + JobPriority + JobPrioritySupported + JobSheets + JobState + JobStateReason + JobStateReasons + JoinRowSet + Joinable + KerberosKey + KerberosPrincipal + KerberosTicket + Kernel + Key + KeyAdapter + KeyAgreement + KeyAgreementSpi + KeyAlreadyExistsException + KeyEvent + KeyEventDispatcher + KeyEventPostProcessor + KeyException + KeyFactory + KeyFactorySpi + KeyGenerator + KeyGeneratorSpi + KeyListener + KeyManagementException + KeyManager + KeyManagerFactory + KeyManagerFactorySpi + KeyPair + KeyPairGenerator + KeyPairGeneratorSpi + KeyRep + KeyRep.Type + KeySpec + KeyStore + KeyStore.Builder + KeyStore.CallbackHandlerProtection + KeyStore.Entry + KeyStore.LoadStoreParameter + KeyStore.PasswordProtection + KeyStore.PrivateKeyEntry + KeyStore.ProtectionParameter + KeyStore.SecretKeyEntry + KeyStore.TrustedCertificateEntry + KeyStoreBuilderParameters + KeyStoreException + KeyStoreSpi + KeyStroke + KeyboardFocusManager + Keymap + LDAPCertStoreParameters + LIFESPAN_POLICY_ID + LOCATION_FORWARD + LSException + LSInput + LSLoadEvent + LSOutput + LSParser + LSParserFilter + LSProgressEvent + LSResourceResolver + LSSerializer + LSSerializerFilter + Label + LabelUI + LabelView + LanguageCallback + LastOwnerException + LayeredHighlighter + LayeredHighlighter.LayerPainter + LayoutFocusTraversalPolicy + LayoutManager + LayoutManager2 + LayoutQueue + LdapContext + LdapName + LdapReferralException + Lease + Level + LexicalHandler + LifespanPolicy + LifespanPolicyOperations + LifespanPolicyValue + LimitExceededException + Line + Line.Info + Line2D + Line2D.Double + Line2D.Float + LineBorder + LineBreakMeasurer + LineEvent + LineEvent.Type + LineListener + LineMetrics + LineNumberInputStream + LineNumberReader + LineUnavailableException + LinkException + LinkLoopException + LinkRef + LinkageError + LinkedBlockingQueue + LinkedHashMap + LinkedHashSet + LinkedList + List + List + ListCellRenderer + ListDataEvent + ListDataListener + ListIterator + ListModel + ListResourceBundle + ListSelectionEvent + ListSelectionListener + ListSelectionModel + ListUI + ListView + ListenerNotFoundException + LoaderHandler + LocalObject + Locale + LocateRegistry + Locator + Locator2 + Locator2Impl + LocatorImpl + Lock + LockSupport + LogManager + LogRecord + LogStream + Logger + LoggingMXBean + LoggingPermission + LoginContext + LoginException + LoginModule + Long + LongBuffer + LongHolder + LongLongSeqHelper + LongLongSeqHolder + LongSeqHelper + LongSeqHolder + LookAndFeel + LookupOp + LookupTable + MARSHAL + MBeanAttributeInfo + MBeanConstructorInfo + MBeanException + MBeanFeatureInfo + MBeanInfo + MBeanNotificationInfo + MBeanOperationInfo + MBeanParameterInfo + MBeanPermission + MBeanRegistration + MBeanRegistrationException + MBeanServer + MBeanServerBuilder + MBeanServerConnection + MBeanServerDelegate + MBeanServerDelegateMBean + MBeanServerFactory + MBeanServerForwarder + MBeanServerInvocationHandler + MBeanServerNotification + MBeanServerNotificationFilter + MBeanServerPermission + MBeanTrustPermission + MGF1ParameterSpec + MLet + MLetMBean + Mac + MacSpi + MalformedInputException + MalformedLinkException + MalformedObjectNameException + MalformedParameterizedTypeException + MalformedURLException + ManageReferralControl + ManagementFactory + ManagementPermission + ManagerFactoryParameters + Manifest + Map + Map.Entry + MappedByteBuffer + MarshalException + MarshalledObject + MaskFormatter + MatchResult + Matcher + Math + MathContext + MatteBorder + Media + MediaName + MediaPrintableArea + MediaSize + MediaSize.Engineering + MediaSize.ISO + MediaSize.JIS + MediaSize.NA + MediaSize.Other + MediaSizeName + MediaTracker + MediaTray + Member + MemoryCacheImageInputStream + MemoryCacheImageOutputStream + MemoryHandler + MemoryImageSource + MemoryMXBean + MemoryManagerMXBean + MemoryNotificationInfo + MemoryPoolMXBean + MemoryType + MemoryUsage + Menu + MenuBar + MenuBarUI + MenuComponent + MenuContainer + MenuDragMouseEvent + MenuDragMouseListener + MenuElement + MenuEvent + MenuItem + MenuItemUI + MenuKeyEvent + MenuKeyListener + MenuListener + MenuSelectionManager + MenuShortcut + MessageDigest + MessageDigestSpi + MessageFormat + MessageFormat.Field + MessageProp + MetaEventListener + MetaMessage + MetalBorders + MetalBorders.ButtonBorder + MetalBorders.Flush3DBorder + MetalBorders.InternalFrameBorder + MetalBorders.MenuBarBorder + MetalBorders.MenuItemBorder + MetalBorders.OptionDialogBorder + MetalBorders.PaletteBorder + MetalBorders.PopupMenuBorder + MetalBorders.RolloverButtonBorder + MetalBorders.ScrollPaneBorder + MetalBorders.TableHeaderBorder + MetalBorders.TextFieldBorder + MetalBorders.ToggleButtonBorder + MetalBorders.ToolBarBorder + MetalButtonUI + MetalCheckBoxIcon + MetalCheckBoxUI + MetalComboBoxButton + MetalComboBoxEditor + MetalComboBoxEditor.UIResource + MetalComboBoxIcon + MetalComboBoxUI + MetalDesktopIconUI + MetalFileChooserUI + MetalIconFactory + MetalIconFactory.FileIcon16 + MetalIconFactory.FolderIcon16 + MetalIconFactory.PaletteCloseIcon + MetalIconFactory.TreeControlIcon + MetalIconFactory.TreeFolderIcon + MetalIconFactory.TreeLeafIcon + MetalInternalFrameTitlePane + MetalInternalFrameUI + MetalLabelUI + MetalLookAndFeel + MetalMenuBarUI + MetalPopupMenuSeparatorUI + MetalProgressBarUI + MetalRadioButtonUI + MetalRootPaneUI + MetalScrollBarUI + MetalScrollButton + MetalScrollPaneUI + MetalSeparatorUI + MetalSliderUI + MetalSplitPaneUI + MetalTabbedPaneUI + MetalTextFieldUI + MetalTheme + MetalToggleButtonUI + MetalToolBarUI + MetalToolTipUI + MetalTreeUI + Method + MethodDescriptor + MidiChannel + MidiDevice + MidiDevice.Info + MidiDeviceProvider + MidiEvent + MidiFileFormat + MidiFileReader + MidiFileWriter + MidiMessage + MidiSystem + MidiUnavailableException + MimeTypeParseException + MinimalHTMLWriter + MissingFormatArgumentException + MissingFormatWidthException + MissingResourceException + Mixer + Mixer.Info + MixerProvider + ModelMBean + ModelMBeanAttributeInfo + ModelMBeanConstructorInfo + ModelMBeanInfo + ModelMBeanInfoSupport + ModelMBeanNotificationBroadcaster + ModelMBeanNotificationInfo + ModelMBeanOperationInfo + ModificationItem + Modifier + Monitor + MonitorMBean + MonitorNotification + MonitorSettingException + MouseAdapter + MouseDragGestureRecognizer + MouseEvent + MouseInfo + MouseInputAdapter + MouseInputListener + MouseListener + MouseMotionAdapter + MouseMotionListener + MouseWheelEvent + MouseWheelListener + MultiButtonUI + MultiColorChooserUI + MultiComboBoxUI + MultiDesktopIconUI + MultiDesktopPaneUI + MultiDoc + MultiDocPrintJob + MultiDocPrintService + MultiFileChooserUI + MultiInternalFrameUI + MultiLabelUI + MultiListUI + MultiLookAndFeel + MultiMenuBarUI + MultiMenuItemUI + MultiOptionPaneUI + MultiPanelUI + MultiPixelPackedSampleModel + MultiPopupMenuUI + MultiProgressBarUI + MultiRootPaneUI + MultiScrollBarUI + MultiScrollPaneUI + MultiSeparatorUI + MultiSliderUI + MultiSpinnerUI + MultiSplitPaneUI + MultiTabbedPaneUI + MultiTableHeaderUI + MultiTableUI + MultiTextUI + MultiToolBarUI + MultiToolTipUI + MultiTreeUI + MultiViewportUI + MulticastSocket + MultipleComponentProfileHelper + MultipleComponentProfileHolder + MultipleDocumentHandling + MultipleMaster + MutableAttributeSet + MutableComboBoxModel + MutableTreeNode + NON_EXISTENT + NO_IMPLEMENT + NO_MEMORY + NO_PERMISSION + NO_RESOURCES + NO_RESPONSE + NVList + Name + NameAlreadyBoundException + NameCallback + NameClassPair + NameComponent + NameComponentHelper + NameComponentHolder + NameDynAnyPair + NameDynAnyPairHelper + NameDynAnyPairSeqHelper + NameHelper + NameHolder + NameList + NameNotFoundException + NameParser + NameValuePair + NameValuePair + NameValuePairHelper + NameValuePairHelper + NameValuePairSeqHelper + NamedNodeMap + NamedValue + NamespaceChangeListener + NamespaceContext + NamespaceSupport + Naming + NamingContext + NamingContextExt + NamingContextExtHelper + NamingContextExtHolder + NamingContextExtOperations + NamingContextExtPOA + NamingContextHelper + NamingContextHolder + NamingContextOperations + NamingContextPOA + NamingEnumeration + NamingEvent + NamingException + NamingExceptionEvent + NamingListener + NamingManager + NamingSecurityException + NavigationFilter + NavigationFilter.FilterBypass + NegativeArraySizeException + NetPermission + NetworkInterface + NoClassDefFoundError + NoConnectionPendingException + NoContext + NoContextHelper + NoInitialContextException + NoPermissionException + NoRouteToHostException + NoServant + NoServantHelper + NoSuchAlgorithmException + NoSuchAttributeException + NoSuchElementException + NoSuchFieldError + NoSuchFieldException + NoSuchMethodError + NoSuchMethodException + NoSuchObjectException + NoSuchPaddingException + NoSuchProviderException + Node + NodeChangeEvent + NodeChangeListener + NodeList + NonReadableChannelException + NonWritableChannelException + NoninvertibleTransformException + NotActiveException + NotBoundException + NotCompliantMBeanException + NotContextException + NotEmpty + NotEmptyHelper + NotEmptyHolder + NotFound + NotFoundHelper + NotFoundHolder + NotFoundReason + NotFoundReasonHelper + NotFoundReasonHolder + NotOwnerException + NotSerializableException + NotYetBoundException + NotYetConnectedException + Notation + Notification + NotificationBroadcaster + NotificationBroadcasterSupport + NotificationEmitter + NotificationFilter + NotificationFilterSupport + NotificationListener + NotificationResult + NullCipher + NullPointerException + Number + NumberFormat + NumberFormat.Field + NumberFormatException + NumberFormatter + NumberOfDocuments + NumberOfInterveningJobs + NumberUp + NumberUpSupported + NumericShaper + OAEPParameterSpec + OBJECT_NOT_EXIST + OBJ_ADAPTER + OMGVMCID + ORB + ORB + ORBIdHelper + ORBInitInfo + ORBInitInfoOperations + ORBInitializer + ORBInitializerOperations + ObjID + Object + Object + ObjectAlreadyActive + ObjectAlreadyActiveHelper + ObjectChangeListener + ObjectFactory + ObjectFactoryBuilder + ObjectHelper + ObjectHolder + ObjectIdHelper + ObjectIdHelper + ObjectImpl + ObjectImpl + ObjectInput + ObjectInputStream + ObjectInputStream.GetField + ObjectInputValidation + ObjectInstance + ObjectName + ObjectNotActive + ObjectNotActiveHelper + ObjectOutput + ObjectOutputStream + ObjectOutputStream.PutField + ObjectReferenceFactory + ObjectReferenceFactoryHelper + ObjectReferenceFactoryHolder + ObjectReferenceTemplate + ObjectReferenceTemplateHelper + ObjectReferenceTemplateHolder + ObjectReferenceTemplateSeqHelper + ObjectReferenceTemplateSeqHolder + ObjectStreamClass + ObjectStreamConstants + ObjectStreamException + ObjectStreamField + ObjectView + Observable + Observer + OceanTheme + OctetSeqHelper + OctetSeqHolder + Oid + OpenDataException + OpenMBeanAttributeInfo + OpenMBeanAttributeInfoSupport + OpenMBeanConstructorInfo + OpenMBeanConstructorInfoSupport + OpenMBeanInfo + OpenMBeanInfoSupport + OpenMBeanOperationInfo + OpenMBeanOperationInfoSupport + OpenMBeanParameterInfo + OpenMBeanParameterInfoSupport + OpenType + OpenType + OperatingSystemMXBean + Operation + OperationNotSupportedException + OperationsException + Option + OptionPaneUI + OptionalDataException + OrientationRequested + OutOfMemoryError + OutputDeviceAssigned + OutputKeys + OutputStream + OutputStream + OutputStream + OutputStreamWriter + OverlappingFileLockException + OverlayLayout + Override + Owner + PBEKey + PBEKeySpec + PBEParameterSpec + PDLOverrideSupported + PERSIST_STORE + PKCS8EncodedKeySpec + PKIXBuilderParameters + PKIXCertPathBuilderResult + PKIXCertPathChecker + PKIXCertPathValidatorResult + PKIXParameters + POA + POAHelper + POAManager + POAManagerOperations + POAOperations + PRIVATE_MEMBER + PSSParameterSpec + PSource + PSource.PSpecified + PUBLIC_MEMBER + Pack200 + Pack200.Packer + Pack200.Unpacker + Package + PackedColorModel + PageAttributes + PageAttributes.ColorType + PageAttributes.MediaType + PageAttributes.OrientationRequestedType + PageAttributes.OriginType + PageAttributes.PrintQualityType + PageFormat + PageRanges + Pageable + PagedResultsControl + PagedResultsResponseControl + PagesPerMinute + PagesPerMinuteColor + Paint + PaintContext + PaintEvent + Panel + PanelUI + Paper + ParagraphView + ParagraphView + Parameter + ParameterBlock + ParameterDescriptor + ParameterMetaData + ParameterMode + ParameterModeHelper + ParameterModeHolder + ParameterizedType + ParseException + ParsePosition + Parser + Parser + ParserAdapter + ParserConfigurationException + ParserDelegator + ParserFactory + PartialResultException + PasswordAuthentication + PasswordCallback + PasswordView + Patch + PathIterator + Pattern + PatternSyntaxException + Permission + Permission + PermissionCollection + Permissions + PersistenceDelegate + PersistentMBean + PhantomReference + Pipe + Pipe.SinkChannel + Pipe.SourceChannel + PipedInputStream + PipedOutputStream + PipedReader + PipedWriter + PixelGrabber + PixelInterleavedSampleModel + PlainDocument + PlainView + Point + Point2D + Point2D.Double + Point2D.Float + PointerInfo + Policy + Policy + Policy + PolicyError + PolicyErrorCodeHelper + PolicyErrorHelper + PolicyErrorHolder + PolicyFactory + PolicyFactoryOperations + PolicyHelper + PolicyHolder + PolicyListHelper + PolicyListHolder + PolicyNode + PolicyOperations + PolicyQualifierInfo + PolicyTypeHelper + Polygon + PooledConnection + Popup + PopupFactory + PopupMenu + PopupMenuEvent + PopupMenuListener + PopupMenuUI + Port + Port.Info + PortUnreachableException + PortableRemoteObject + PortableRemoteObjectDelegate + Position + Position.Bias + Predicate + PreferenceChangeEvent + PreferenceChangeListener + Preferences + PreferencesFactory + PreparedStatement + PresentationDirection + Principal + Principal + PrincipalHolder + PrintEvent + PrintException + PrintGraphics + PrintJob + PrintJobAdapter + PrintJobAttribute + PrintJobAttributeEvent + PrintJobAttributeListener + PrintJobAttributeSet + PrintJobEvent + PrintJobListener + PrintQuality + PrintRequestAttribute + PrintRequestAttributeSet + PrintService + PrintServiceAttribute + PrintServiceAttributeEvent + PrintServiceAttributeListener + PrintServiceAttributeSet + PrintServiceLookup + PrintStream + PrintWriter + Printable + PrinterAbortException + PrinterException + PrinterGraphics + PrinterIOException + PrinterInfo + PrinterIsAcceptingJobs + PrinterJob + PrinterLocation + PrinterMakeAndModel + PrinterMessageFromOperator + PrinterMoreInfo + PrinterMoreInfoManufacturer + PrinterName + PrinterResolution + PrinterState + PrinterStateReason + PrinterStateReasons + PrinterURI + PriorityBlockingQueue + PriorityQueue + PrivateClassLoader + PrivateCredentialPermission + PrivateKey + PrivateMLet + PrivilegedAction + PrivilegedActionException + PrivilegedExceptionAction + Process + ProcessBuilder + ProcessingInstruction + ProfileDataException + ProfileIdHelper + ProgressBarUI + ProgressMonitor + ProgressMonitorInputStream + Properties + PropertyChangeEvent + PropertyChangeListener + PropertyChangeListenerProxy + PropertyChangeSupport + PropertyDescriptor + PropertyEditor + PropertyEditorManager + PropertyEditorSupport + PropertyPermission + PropertyResourceBundle + PropertyVetoException + ProtectionDomain + ProtocolException + Provider + Provider.Service + ProviderException + Proxy + Proxy + Proxy.Type + ProxySelector + PublicKey + PushbackInputStream + PushbackReader + QName + QuadCurve2D + QuadCurve2D.Double + QuadCurve2D.Float + Query + QueryEval + QueryExp + Queue + QueuedJobCount + RC2ParameterSpec + RC5ParameterSpec + REBIND + REQUEST_PROCESSING_POLICY_ID + RGBImageFilter + RMIClassLoader + RMIClassLoaderSpi + RMIClientSocketFactory + RMIConnection + RMIConnectionImpl + RMIConnectionImpl_Stub + RMIConnector + RMIConnectorServer + RMICustomMaxStreamFormat + RMIFailureHandler + RMIIIOPServerImpl + RMIJRMPServerImpl + RMISecurityException + RMISecurityManager + RMIServer + RMIServerImpl + RMIServerImpl_Stub + RMIServerSocketFactory + RMISocketFactory + RSAKey + RSAKeyGenParameterSpec + RSAMultiPrimePrivateCrtKey + RSAMultiPrimePrivateCrtKeySpec + RSAOtherPrimeInfo + RSAPrivateCrtKey + RSAPrivateCrtKeySpec + RSAPrivateKey + RSAPrivateKeySpec + RSAPublicKey + RSAPublicKeySpec + RTFEditorKit + Random + RandomAccess + RandomAccessFile + Raster + RasterFormatException + RasterOp + Rdn + ReadOnlyBufferException + ReadWriteLock + Readable + ReadableByteChannel + Reader + RealmCallback + RealmChoiceCallback + Receiver + Rectangle + Rectangle2D + Rectangle2D.Double + Rectangle2D.Float + RectangularShape + ReentrantLock + ReentrantReadWriteLock + ReentrantReadWriteLock.ReadLock + ReentrantReadWriteLock.WriteLock + Ref + RefAddr + Reference + Reference + ReferenceQueue + ReferenceUriSchemesSupported + Referenceable + ReferralException + ReflectPermission + ReflectionException + RefreshFailedException + Refreshable + Region + RegisterableService + Registry + RegistryHandler + RejectedExecutionException + RejectedExecutionHandler + Relation + RelationException + RelationNotFoundException + RelationNotification + RelationService + RelationServiceMBean + RelationServiceNotRegisteredException + RelationSupport + RelationSupportMBean + RelationType + RelationTypeNotFoundException + RelationTypeSupport + RemarshalException + Remote + RemoteCall + RemoteException + RemoteObject + RemoteObjectInvocationHandler + RemoteRef + RemoteServer + RemoteStub + RenderContext + RenderableImage + RenderableImageOp + RenderableImageProducer + RenderedImage + RenderedImageFactory + Renderer + RenderingHints + RenderingHints.Key + RepaintManager + ReplicateScaleFilter + RepositoryIdHelper + Request + RequestInfo + RequestInfoOperations + RequestProcessingPolicy + RequestProcessingPolicyOperations + RequestProcessingPolicyValue + RequestingUserName + RequiredModelMBean + RescaleOp + ResolutionSyntax + ResolveResult + Resolver + ResourceBundle + ResponseCache + ResponseHandler + Result + ResultSet + ResultSetMetaData + Retention + RetentionPolicy + ReverbType + Robot + Role + RoleInfo + RoleInfoNotFoundException + RoleList + RoleNotFoundException + RoleResult + RoleStatus + RoleUnresolved + RoleUnresolvedList + RootPaneContainer + RootPaneUI + RoundRectangle2D + RoundRectangle2D.Double + RoundRectangle2D.Float + RoundingMode + RowMapper + RowSet + RowSetEvent + RowSetInternal + RowSetListener + RowSetMetaData + RowSetMetaDataImpl + RowSetReader + RowSetWarning + RowSetWriter + RuleBasedCollator + RunTime + RunTimeOperations + Runnable + Runtime + RuntimeErrorException + RuntimeException + RuntimeMBeanException + RuntimeMXBean + RuntimeOperationsException + RuntimePermission + SAXException + SAXNotRecognizedException + SAXNotSupportedException + SAXParseException + SAXParser + SAXParserFactory + SAXResult + SAXSource + SAXTransformerFactory + SERVANT_RETENTION_POLICY_ID + SQLData + SQLException + SQLInput + SQLInputImpl + SQLOutput + SQLOutputImpl + SQLPermission + SQLWarning + SSLContext + SSLContextSpi + SSLEngine + SSLEngineResult + SSLEngineResult.HandshakeStatus + SSLEngineResult.Status + SSLException + SSLHandshakeException + SSLKeyException + SSLPeerUnverifiedException + SSLPermission + SSLProtocolException + SSLServerSocket + SSLServerSocketFactory + SSLSession + SSLSessionBindingEvent + SSLSessionBindingListener + SSLSessionContext + SSLSocket + SSLSocketFactory + SUCCESSFUL + SYNC_WITH_TRANSPORT + SYSTEM_EXCEPTION + SampleModel + Sasl + SaslClient + SaslClientFactory + SaslException + SaslServer + SaslServerFactory + Savepoint + Scanner + ScatteringByteChannel + ScheduledExecutorService + ScheduledFuture + ScheduledThreadPoolExecutor + Schema + SchemaFactory + SchemaFactoryLoader + SchemaViolationException + ScrollBarUI + ScrollPane + ScrollPaneAdjustable + ScrollPaneConstants + ScrollPaneLayout + ScrollPaneLayout.UIResource + ScrollPaneUI + Scrollable + Scrollbar + SealedObject + SearchControls + SearchResult + SecretKey + SecretKeyFactory + SecretKeyFactorySpi + SecretKeySpec + SecureCacheResponse + SecureClassLoader + SecureRandom + SecureRandomSpi + Security + SecurityException + SecurityManager + SecurityPermission + Segment + SelectableChannel + SelectionKey + Selector + SelectorProvider + Semaphore + SeparatorUI + Sequence + SequenceInputStream + Sequencer + Sequencer.SyncMode + SerialArray + SerialBlob + SerialClob + SerialDatalink + SerialException + SerialJavaObject + SerialRef + SerialStruct + Serializable + SerializablePermission + Servant + ServantActivator + ServantActivatorHelper + ServantActivatorOperations + ServantActivatorPOA + ServantAlreadyActive + ServantAlreadyActiveHelper + ServantLocator + ServantLocatorHelper + ServantLocatorOperations + ServantLocatorPOA + ServantManager + ServantManagerOperations + ServantNotActive + ServantNotActiveHelper + ServantObject + ServantRetentionPolicy + ServantRetentionPolicyOperations + ServantRetentionPolicyValue + ServerCloneException + ServerError + ServerException + ServerIdHelper + ServerNotActiveException + ServerRef + ServerRequest + ServerRequestInfo + ServerRequestInfoOperations + ServerRequestInterceptor + ServerRequestInterceptorOperations + ServerRuntimeException + ServerSocket + ServerSocketChannel + ServerSocketFactory + ServiceContext + ServiceContextHelper + ServiceContextHolder + ServiceContextListHelper + ServiceContextListHolder + ServiceDetail + ServiceDetailHelper + ServiceIdHelper + ServiceInformation + ServiceInformationHelper + ServiceInformationHolder + ServiceNotFoundException + ServicePermission + ServiceRegistry + ServiceRegistry.Filter + ServiceUI + ServiceUIFactory + ServiceUnavailableException + Set + SetOfIntegerSyntax + SetOverrideType + SetOverrideTypeHelper + Severity + Shape + ShapeGraphicAttribute + SheetCollate + Short + ShortBuffer + ShortBufferException + ShortHolder + ShortLookupTable + ShortMessage + ShortSeqHelper + ShortSeqHolder + Sides + Signature + SignatureException + SignatureSpi + SignedObject + Signer + SimpleAttributeSet + SimpleBeanInfo + SimpleDateFormat + SimpleDoc + SimpleFormatter + SimpleTimeZone + SimpleType + SinglePixelPackedSampleModel + SingleSelectionModel + Size2DSyntax + SizeLimitExceededException + SizeRequirements + SizeSequence + Skeleton + SkeletonMismatchException + SkeletonNotFoundException + SliderUI + Socket + SocketAddress + SocketChannel + SocketException + SocketFactory + SocketHandler + SocketImpl + SocketImplFactory + SocketOptions + SocketPermission + SocketSecurityException + SocketTimeoutException + SoftBevelBorder + SoftReference + SortControl + SortKey + SortResponseControl + SortedMap + SortedSet + SortingFocusTraversalPolicy + Soundbank + SoundbankReader + SoundbankResource + Source + SourceDataLine + SourceLocator + SpinnerDateModel + SpinnerListModel + SpinnerModel + SpinnerNumberModel + SpinnerUI + SplitPaneUI + Spring + SpringLayout + SpringLayout.Constraints + SslRMIClientSocketFactory + SslRMIServerSocketFactory + Stack + StackOverflowError + StackTraceElement + StandardMBean + StartTlsRequest + StartTlsResponse + State + StateEdit + StateEditable + StateFactory + Statement + Statement + StreamCorruptedException + StreamHandler + StreamPrintService + StreamPrintServiceFactory + StreamResult + StreamSource + StreamTokenizer + Streamable + StreamableValue + StrictMath + String + StringBuffer + StringBufferInputStream + StringBuilder + StringCharacterIterator + StringContent + StringHolder + StringIndexOutOfBoundsException + StringMonitor + StringMonitorMBean + StringNameHelper + StringReader + StringRefAddr + StringSelection + StringSeqHelper + StringSeqHolder + StringTokenizer + StringValueExp + StringValueHelper + StringWriter + Stroke + Struct + StructMember + StructMemberHelper + Stub + StubDelegate + StubNotFoundException + Style + StyleConstants + StyleConstants.CharacterConstants + StyleConstants.ColorConstants + StyleConstants.FontConstants + StyleConstants.ParagraphConstants + StyleContext + StyleSheet + StyleSheet.BoxPainter + StyleSheet.ListPainter + StyledDocument + StyledEditorKit + StyledEditorKit.AlignmentAction + StyledEditorKit.BoldAction + StyledEditorKit.FontFamilyAction + StyledEditorKit.FontSizeAction + StyledEditorKit.ForegroundAction + StyledEditorKit.ItalicAction + StyledEditorKit.StyledTextAction + StyledEditorKit.UnderlineAction + Subject + SubjectDelegationPermission + SubjectDomainCombiner + SupportedValuesAttribute + SuppressWarnings + SwingConstants + SwingPropertyChangeSupport + SwingUtilities + SyncFactory + SyncFactoryException + SyncFailedException + SyncProvider + SyncProviderException + SyncResolver + SyncScopeHelper + SynchronousQueue + SynthConstants + SynthContext + SynthGraphicsUtils + SynthLookAndFeel + SynthPainter + SynthStyle + SynthStyleFactory + Synthesizer + SysexMessage + System + SystemColor + SystemException + SystemFlavorMap + TAG_ALTERNATE_IIOP_ADDRESS + TAG_CODE_SETS + TAG_INTERNET_IOP + TAG_JAVA_CODEBASE + TAG_MULTIPLE_COMPONENTS + TAG_ORB_TYPE + TAG_POLICIES + TAG_RMI_CUSTOM_MAX_STREAM_FORMAT + TCKind + THREAD_POLICY_ID + TIMEOUT + TRANSACTION_MODE + TRANSACTION_REQUIRED + TRANSACTION_ROLLEDBACK + TRANSACTION_UNAVAILABLE + TRANSIENT + TRANSPORT_RETRY + TabExpander + TabSet + TabStop + TabableView + TabbedPaneUI + TableCellEditor + TableCellRenderer + TableColumn + TableColumnModel + TableColumnModelEvent + TableColumnModelListener + TableHeaderUI + TableModel + TableModelEvent + TableModelListener + TableUI + TableView + TabularData + TabularDataSupport + TabularType + TagElement + TaggedComponent + TaggedComponentHelper + TaggedComponentHolder + TaggedProfile + TaggedProfileHelper + TaggedProfileHolder + Target + TargetDataLine + TargetedNotification + Templates + TemplatesHandler + Text + TextAction + TextArea + TextAttribute + TextComponent + TextEvent + TextField + TextHitInfo + TextInputCallback + TextLayout + TextLayout.CaretPolicy + TextListener + TextMeasurer + TextOutputCallback + TextSyntax + TextUI + TexturePaint + Thread + Thread.State + Thread.UncaughtExceptionHandler + ThreadDeath + ThreadFactory + ThreadGroup + ThreadInfo + ThreadLocal + ThreadMXBean + ThreadPolicy + ThreadPolicyOperations + ThreadPolicyValue + ThreadPoolExecutor + ThreadPoolExecutor.AbortPolicy + ThreadPoolExecutor.CallerRunsPolicy + ThreadPoolExecutor.DiscardOldestPolicy + ThreadPoolExecutor.DiscardPolicy + Throwable + Tie + TileObserver + Time + TimeLimitExceededException + TimeUnit + TimeZone + TimeoutException + Timer + Timer + Timer + TimerAlarmClockNotification + TimerMBean + TimerNotification + TimerTask + Timestamp + Timestamp + TitledBorder + TooManyListenersException + ToolBarUI + ToolTipManager + ToolTipUI + Toolkit + Track + TransactionRequiredException + TransactionRolledbackException + TransactionService + TransactionalWriter + TransferHandler + Transferable + TransformAttribute + Transformer + TransformerConfigurationException + TransformerException + TransformerFactory + TransformerFactoryConfigurationError + TransformerHandler + Transmitter + Transparency + TreeCellEditor + TreeCellRenderer + TreeExpansionEvent + TreeExpansionListener + TreeMap + TreeModel + TreeModelEvent + TreeModelListener + TreeNode + TreePath + TreeSelectionEvent + TreeSelectionListener + TreeSelectionModel + TreeSet + TreeUI + TreeWillExpandListener + TrustAnchor + TrustManager + TrustManagerFactory + TrustManagerFactorySpi + Type + TypeCode + TypeCodeHolder + TypeInfo + TypeInfoProvider + TypeMismatch + TypeMismatch + TypeMismatch + TypeMismatchHelper + TypeMismatchHelper + TypeNotPresentException + TypeVariable + Types + UID + UIDefaults + UIDefaults.ActiveValue + UIDefaults.LazyInputMap + UIDefaults.LazyValue + UIDefaults.ProxyLazyValue + UIManager + UIManager.LookAndFeelInfo + UIResource + ULongLongSeqHelper + ULongLongSeqHolder + ULongSeqHelper + ULongSeqHolder + UNKNOWN + UNKNOWN + UNSUPPORTED_POLICY + UNSUPPORTED_POLICY_VALUE + URI + URIException + URIResolver + URISyntax + URISyntaxException + URL + URLClassLoader + URLConnection + URLDecoder + URLEncoder + URLStreamHandler + URLStreamHandlerFactory + URLStringHelper + USER_EXCEPTION + UShortSeqHelper + UShortSeqHolder + UTFDataFormatException + UUID + UndeclaredThrowableException + UndoManager + UndoableEdit + UndoableEditEvent + UndoableEditListener + UndoableEditSupport + UnexpectedException + UnicastRemoteObject + UnionMember + UnionMemberHelper + UnknownEncoding + UnknownEncodingHelper + UnknownError + UnknownException + UnknownFormatConversionException + UnknownFormatFlagsException + UnknownGroupException + UnknownHostException + UnknownHostException + UnknownObjectException + UnknownServiceException + UnknownUserException + UnknownUserExceptionHelper + UnknownUserExceptionHolder + UnmappableCharacterException + UnmarshalException + UnmodifiableClassException + UnmodifiableSetException + UnrecoverableEntryException + UnrecoverableKeyException + Unreferenced + UnresolvedAddressException + UnresolvedPermission + UnsatisfiedLinkError + UnsolicitedNotification + UnsolicitedNotificationEvent + UnsolicitedNotificationListener + UnsupportedAddressTypeException + UnsupportedAudioFileException + UnsupportedCallbackException + UnsupportedCharsetException + UnsupportedClassVersionError + UnsupportedEncodingException + UnsupportedFlavorException + UnsupportedLookAndFeelException + UnsupportedOperationException + UserDataHandler + UserException + Util + UtilDelegate + Utilities + VMID + VM_ABSTRACT + VM_CUSTOM + VM_NONE + VM_TRUNCATABLE + Validator + ValidatorHandler + ValueBase + ValueBaseHelper + ValueBaseHolder + ValueExp + ValueFactory + ValueHandler + ValueHandlerMultiFormat + ValueInputStream + ValueMember + ValueMemberHelper + ValueOutputStream + VariableHeightLayoutCache + Vector + VerifyError + VersionSpecHelper + VetoableChangeListener + VetoableChangeListenerProxy + VetoableChangeSupport + View + ViewFactory + ViewportLayout + ViewportUI + VirtualMachineError + Visibility + VisibilityHelper + VoiceStatus + Void + VolatileImage + WCharSeqHelper + WCharSeqHolder + WStringSeqHelper + WStringSeqHolder + WStringValueHelper + WeakHashMap + WeakReference + WebRowSet + WildcardType + Window + WindowAdapter + WindowConstants + WindowEvent + WindowFocusListener + WindowListener + WindowStateListener + WrappedPlainView + WritableByteChannel + WritableRaster + WritableRenderedImage + WriteAbortedException + Writer + WrongAdapter + WrongAdapterHelper + WrongPolicy + WrongPolicyHelper + WrongTransaction + WrongTransactionHelper + WrongTransactionHolder + X500Principal + X500PrivateCredential + X509CRL + X509CRLEntry + X509CRLSelector + X509CertSelector + X509Certificate + X509Certificate + X509EncodedKeySpec + X509ExtendedKeyManager + X509Extension + X509KeyManager + X509TrustManager + XAConnection + XADataSource + XAException + XAResource + XMLConstants + XMLDecoder + XMLEncoder + XMLFilter + XMLFilterImpl + XMLFormatter + XMLGregorianCalendar + XMLParseException + XMLReader + XMLReaderAdapter + XMLReaderFactory + XPath + XPathConstants + XPathException + XPathExpression + XPathExpressionException + XPathFactory + XPathFactoryConfigurationException + XPathFunction + XPathFunctionException + XPathFunctionResolver + XPathVariableResolver + Xid + XmlReader + XmlWriter + ZipEntry + ZipException + ZipFile + ZipInputStream + ZipOutputStream + ZoneView + _BindingIteratorImplBase + _BindingIteratorStub + _DynAnyFactoryStub + _DynAnyStub + _DynArrayStub + _DynEnumStub + _DynFixedStub + _DynSequenceStub + _DynStructStub + _DynUnionStub + _DynValueStub + _IDLTypeStub + _NamingContextExtStub + _NamingContextImplBase + _NamingContextStub + _PolicyStub + _Remote_Stub + _ServantActivatorStub + _ServantLocatorStub + + + + AbstractAnnotationValueVisitor6 + AbstractElementVisitor6 + AbstractMarshallerImpl + AbstractOwnableSynchronizer + AbstractProcessor + AbstractQueuedLongSynchronizer + AbstractScriptEngine + AbstractTypeVisitor6 + AbstractUnmarshallerImpl + ActivationDataFlavor + AlgorithmMethod + AnnotationMirror + AnnotationValue + AnnotationValueVisitor + ArrayDeque + AsyncHandler + AttachmentMarshaller + AttachmentPart + AttachmentUnmarshaller + Binder + BindingProvider + Bindings + BlockingDeque + BreakIteratorProvider + C14NMethodParameterSpec + CanonicalizationMethod + Characters + ClientInfoStatus + CollapsedStringAdapter + CollatorProvider + CommandInfo + CommandMap + CommandObject + CommonDataSource + Compilable + CompiledScript + Completion + Completions + CompositeDataInvocationHandler + CompositeDataView + ConcurrentNavigableMap + ConcurrentSkipListMap + ConcurrentSkipListSet + ConfigurationSpi + Console + ConstructorProperties + CookieManager + CookiePolicy + CookieStore + CurrencyNameProvider + Data + DataContentHandler + DataContentHandlerFactory + DataHandler + DatatypeConverter + DatatypeConverterInterface + DateFormatProvider + DateFormatSymbolsProvider + DecimalFormatSymbolsProvider + DeclaredType + DefaultRowSorter + DefaultValidationEventHandler + DeflaterInputStream + Deque + DescriptorKey + DescriptorRead + Desktop + Detail + DetailEntry + Diagnostic + DiagnosticCollector + DiagnosticListener + DigestMethod + DigestMethodParameterSpec + Dispatch + DOMCryptoContext + DomHandler + DOMSignContext + DOMStructure + DOMURIReference + DOMValidateContext + DropMode + ElementFilter + ElementKind + ElementKindVisitor6 + Elements + ElementScanner6 + ElementVisitor + EndDocument + EndElement + Endpoint + EntityDeclaration + ErrorType + EventException + EventFilter + EventReaderDelegate + EventTarget + ExcC14NParameterSpec + ExecutableElement + ExecutableType + FileDataSource + FileNameExtensionFilter + FileObject + Filer + FilerException + FileTypeMap + ForwardingFileObject + ForwardingJavaFileManager + ForwardingJavaFileObject + Generated + GridBagLayoutInfo + GroupLayout + HandlerChain + HandlerResolver + HexBinaryAdapter + HMACParameterSpec + Holder + HTTPBinding + HttpCookie + HTTPException + IDN + ImmutableDescriptor + InflaterOutputStream + InitParam + InterfaceAddress + Invocable + IOError + JavaCompiler + JavaFileManager + JavaFileObject + JAXBContext + JAXBElement + JAXBException + JAXBIntrospector + JAXBResult + JAXBSource + JMX + JMXAddressable + KeyInfo + KeyInfoFactory + KeyName + KeySelector + KeySelectorException + KeySelectorResult + KeyValue + LayoutPath + LayoutStyle + LinearGradientPaint + LinkedBlockingDeque + LocaleNameProvider + LocaleServiceProvider + Location + LockInfo + LogicalHandler + LogicalMessage + LogicalMessageContext + MailcapCommandMap + Marshaller + MessageContext + MessageFactory + Messager + MimeHeader + MimeHeaders + MimeType + MimeTypeParameterList + MimetypesFileTypeMap + MirroredTypeException + MirroredTypesException + MLetContent + MonitorInfo + MultipleGradientPaint + MutationEvent + MXBean + Namespace + NavigableMap + NavigableSet + NClob + NestingKind + NodeSetData + NormalizedStringAdapter + Normalizer + NoSuchMechanismException + NotationDeclaration + NotIdentifiableEvent + NotIdentifiableEventImpl + NoType + NullType + NumberFormatProvider + OctetStreamData + Oneway + OptionChecker + PackageElement + ParseConversionEvent + ParseConversionEventImpl + Path2D + PGPData + PolicySpi + PortInfo + PostConstruct + PreDestroy + PrimitiveType + PrintConversionEvent + PrintConversionEventImpl + ProcessingEnvironment + Processor + PropertyException + RadialGradientPaint + ReferenceType + RequestWrapper + Resource + Resources + Response + ResponseWrapper + RetrievalMethod + RoundEnvironment + RowFilter + RowId + RowIdLifetime + RowSorter + RowSorterEvent + RowSorterListener + RunnableFuture + RunnableScheduledFuture + SAAJMetaFactory + SAAJResult + SchemaOutputResolver + ScriptContext + ScriptEngine + ScriptEngineFactory + ScriptEngineManager + ScriptException + Service + ServiceConfigurationError + ServiceDelegate + ServiceLoader + ServiceMode + SignatureMethod + SignatureMethodParameterSpec + SignatureProperties + SignatureProperty + SignedInfo + SimpleAnnotationValueVisitor6 + SimpleBindings + SimpleElementVisitor6 + SimpleJavaFileObject + SimpleScriptContext + SimpleTypeVisitor6 + SOAPBinding + SOAPBinding + SOAPBody + SOAPBodyElement + SOAPConnection + SOAPConnectionFactory + SOAPConstants + SOAPElement + SOAPElementFactory + SOAPEnvelope + SOAPException + SOAPFactory + SOAPFault + SOAPFaultElement + SOAPFaultException + SOAPHandler + SOAPHeader + SOAPHeaderElement + SOAPMessage + SOAPMessageContext + SOAPMessageHandler + SOAPMessageHandlers + SOAPPart + SortOrder + SourceVersion + SplashScreen + SQLClientInfoException + SQLDataException + SQLFeatureNotSupportedException + SQLIntegrityConstraintViolationException + SQLInvalidAuthorizationSpecException + SQLNonTransientConnectionException + SQLNonTransientException + SQLRecoverableException + SQLSyntaxErrorException + SQLTimeoutException + SQLTransactionRollbackException + SQLTransientConnectionException + SQLTransientException + SQLXML + SSLParameters + StandardEmitterMBean + StandardJavaFileManager + StandardLocation + StartDocument + StartElement + StatementEvent + StatementEventListener + StAXResult + StAXSource + StreamFilter + StreamReaderDelegate + SupportedAnnotationTypes + SupportedOptions + SupportedSourceVersion + SwingWorker + SystemTray + TableRowSorter + TableStringConverter + TimeZoneNameProvider + Tool + ToolProvider + Transform + TransformException + TransformParameterSpec + TransformService + TrayIcon + TypeConstraintException + TypeElement + TypeKind + TypeKindVisitor6 + TypeMirror + TypeParameterElement + TypeVisitor + UIEvent + UnknownAnnotationValueException + UnknownElementException + UnknownTypeException + Unmarshaller + UnmarshallerHandler + UnsupportedDataTypeException + URIDereferencer + URIParameter + URIReference + URIReferenceException + URLDataSource + ValidationEvent + ValidationEventCollector + ValidationEventHandler + ValidationEventImpl + ValidationEventLocator + ValidationEventLocatorImpl + ValidationException + VariableElement + W3CDomHandler + WebEndpoint + WebFault + WebMethod + WebParam + WebResult + WebService + WebServiceClient + WebServiceContext + WebServiceException + WebServicePermission + WebServiceProvider + WebServiceRef + WebServiceRefs + Wrapper + X509Data + X509IssuerSerial + XmlAccessOrder + XmlAccessorOrder + XmlAccessorType + XmlAccessType + XmlAdapter + XmlAnyAttribute + XmlAnyElement + XmlAttachmentRef + XmlAttribute + XMLCryptoContext + XmlElement + XmlElementDecl + XmlElementRef + XmlElementRefs + XmlElements + XmlElementWrapper + XmlEnum + XmlEnumValue + XMLEvent + XMLEventAllocator + XMLEventConsumer + XMLEventFactory + XMLEventReader + XMLEventWriter + XmlID + XmlIDREF + XmlInlineBinaryData + XMLInputFactory + XmlJavaTypeAdapter + XmlJavaTypeAdapters + XmlList + XmlMimeType + XmlMixed + XmlNs + XmlNsForm + XMLObject + XMLOutputFactory + XmlRegistry + XMLReporter + XMLResolver + XmlRootElement + XmlSchema + XmlSchemaType + XmlSchemaTypes + XMLSignature + XMLSignatureException + XMLSignatureFactory + XMLSignContext + XMLStreamConstants + XMLStreamException + XMLStreamReader + XMLStreamWriter + XMLStructure + XmlTransient + XmlType + XMLValidateContext + XmlValue + XPathFilter2ParameterSpec + XPathFilterParameterSpec + XPathType + XSLTTransformParameterSpec + ZipError + + + + + as + in + + abstract + break + case + catch + class + continue + default + do + else + enum + extends + false + finally + for + goto + if + implements + instanceof + @interface + interface + native + new + null + private + protected + public + return + super + strictfp + switch + synchronized + this + throws + throw + transient + true + try + volatile + while + + + def + + boolean + byte + char + const + double + final + float + int + long + short + static + void + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/hamlet.xml b/syntax/hamlet.xml --- a/syntax/hamlet.xml +++ b/syntax/hamlet.xml @@ -5,7 +5,7 @@ word character *or* a number, hence the lookahead --> ]> - + @@ -96,9 +96,7 @@ - - - + diff --git a/syntax/haskell.xml b/syntax/haskell.xml --- a/syntax/haskell.xml +++ b/syntax/haskell.xml @@ -1,6 +1,6 @@ - + case @@ -459,8 +459,8 @@ - - + + @@ -484,7 +484,7 @@ - + @@ -512,11 +512,15 @@ + + - - + + + + @@ -535,8 +539,8 @@ - - + + @@ -642,8 +646,9 @@ - + + diff --git a/syntax/haxe.xml b/syntax/haxe.xml --- a/syntax/haxe.xml +++ b/syntax/haxe.xml @@ -12,7 +12,7 @@ ======================================================================== --> - + @@ -146,9 +146,16 @@ - + + + + + + + + @@ -174,8 +181,9 @@ - + + diff --git a/syntax/html.xml b/syntax/html.xml --- a/syntax/html.xml +++ b/syntax/html.xml @@ -3,9 +3,9 @@ [ - + ]> - + @@ -33,37 +33,37 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -85,16 +85,17 @@ - + + + - - + @@ -172,7 +173,7 @@ - + @@ -193,6 +194,7 @@ + @@ -310,7 +312,8 @@ - + + diff --git a/syntax/idris.xml b/syntax/idris.xml --- a/syntax/idris.xml +++ b/syntax/idris.xml @@ -1,105 +1,105 @@ - + - abstract - auto - case - class - codata - constructor - covering - data - default - do - dsl - else - export - if - implementation - implicit - import - impossible - in - index_first - index_next - infix - infixl - infixr - instance - interface - lambda - let - module - mutual - namespace - of - parameters - partial - pattern - postulate - prefix - private - proof - public - record - rewrite - static - syntax - tactics - term - then - total - using - variable - where - with + abstract + auto + case + class + codata + constructor + covering + data + default + do + dsl + else + export + if + implementation + implicit + import + impossible + in + index_first + index_next + infix + infixl + infixr + instance + interface + lambda + let + module + mutual + namespace + of + parameters + partial + pattern + postulate + prefix + private + proof + public + record + rewrite + static + syntax + tactics + term + then + total + using + variable + where + with - access - assert_total - default - dynamic - elim - error_handlers - error_reverse - flag - hide - include - language - lib - link - name - provide - reflection + access + assert_total + default + dynamic + elim + error_handlers + error_reverse + flag + hide + include + language + lib + link + name + provide + reflection - applyTactic - attack - compute - exact - fill - focus - induction - intro - intros - let - refine - reflect - rewrite - solve - trivial - try + applyTactic + attack + compute + exact + fill + focus + induction + intro + intros + let + refine + reflect + rewrite + solve + trivial + try + String="---*(?=[^!#\$%&\*\+/<=>\?\@\^\|~\.:]|$)" /> - + String="\|\|\|(?=[^\-!#\$%&\*\+/<=>\?\@\^\|~\.:]|$)" /> + @@ -139,10 +139,17 @@ - + + + + + - - + + + + + @@ -167,7 +174,7 @@ - + diff --git a/syntax/ini.xml b/syntax/ini.xml --- a/syntax/ini.xml +++ b/syntax/ini.xml @@ -1,6 +1,6 @@ - + @@ -49,6 +49,7 @@ + @@ -69,10 +70,10 @@ - + diff --git a/syntax/isocpp.xml b/syntax/isocpp.xml --- a/syntax/isocpp.xml +++ b/syntax/isocpp.xml @@ -1,8 +1,8 @@ - + + @@ -11,7 +11,9 @@ - + + + @@ -22,7 +24,7 @@ while + alignof alignas @@ -64,7 +67,8 @@ auto class consteval - constexpr + constinit + constexpr const_cast decltype delete @@ -72,7 +76,7 @@ enum explicit false - final + final friend inline namespace @@ -80,7 +84,7 @@ noexcept nullptr operator - override + override private protected public @@ -167,6 +171,7 @@ + bool char @@ -300,7 +305,7 @@ - + @@ -357,7 +362,7 @@ - + @@ -387,16 +392,16 @@ - + - - - - + + + + @@ -489,25 +494,20 @@ - - - - - - - + - + + @@ -552,7 +552,7 @@ - + @@ -687,8 +687,7 @@ - - + @@ -702,7 +701,7 @@ - + diff --git a/syntax/j.xml b/syntax/j.xml --- a/syntax/j.xml +++ b/syntax/j.xml @@ -62,7 +62,7 @@ --> - + + + + + @@ -117,3 +121,4 @@ + diff --git a/syntax/java.xml b/syntax/java.xml --- a/syntax/java.xml +++ b/syntax/java.xml @@ -4,7 +4,7 @@ ]> - + ACTIVE @@ -3786,9 +3786,9 @@ - + - + @@ -3826,11 +3826,15 @@ + + + + @@ -3858,8 +3862,9 @@ - + + diff --git a/syntax/javascript-react.xml b/syntax/javascript-react.xml --- a/syntax/javascript-react.xml +++ b/syntax/javascript-react.xml @@ -21,7 +21,7 @@ This file is part of the KDE's KSyntaxHighlighting framework. - Copyright 2018-2019 Nibaldo González S. (nibgonz@gmail.com) + Copyright 2018-2020 Nibaldo González S. (nibgonz@gmail.com) This Source Code Form is subject to the terms of the MIT License. If a copy of the license was not distributed with this file, @@ -38,6 +38,7 @@ available at: https://github.com/Microsoft/TypeScript-TmLanguage Change log: + * v9 [2020-06-03]: Add folding in templates. * v8 [2019-11-21]: Tag detection is more stricter. * v7 [2019-11-19]: Rename definition "JavaScript React" to "JavaScript React (JSX)". * v5 [2019-02-20]: Don't highlight tags within declarations of @@ -52,7 +53,7 @@ * v1 [2018-06-20]: Initial version --> - @@ -75,7 +76,7 @@ - + @@ -92,7 +93,7 @@ - + diff --git a/syntax/javascript.xml b/syntax/javascript.xml --- a/syntax/javascript.xml +++ b/syntax/javascript.xml @@ -9,12 +9,15 @@ Minor changes: Joseph Wenninger Full JavaScript 1.0 support by Whitehawk Stormchaser - Last Update: Nov. 20, 2019 (Version 14) + Last Update: Jun. 03, 2020 (Version 15) - IMPORTANT: This syntax highlighting definition depends on - JavaScript React (JSX), TypeScript and QML. + IMPORTANT: This syntax highlighting definition depends on: + * JavaScript React (JSX) + * TypeScript + * QML + * CoffeeScript (embedded) --> - @@ -977,6 +980,7 @@ index innerHeight innerWidth + innerHTML input isMap label @@ -1748,11 +1752,13 @@ + + - + @@ -1770,11 +1776,14 @@ + + + @@ -1785,13 +1794,13 @@ - + - - + + @@ -1823,24 +1832,36 @@ - + - - + + + - - - + + + + + + + + + + - - - + + + + + + + - - + + @@ -1853,7 +1874,7 @@ - + diff --git a/syntax/json.xml b/syntax/json.xml --- a/syntax/json.xml +++ b/syntax/json.xml @@ -12,7 +12,7 @@ ** http://tools.ietf.org/html/rfc4627 *************************************************************************** --> - + null diff --git a/syntax/jsp.xml b/syntax/jsp.xml --- a/syntax/jsp.xml +++ b/syntax/jsp.xml @@ -1,6 +1,6 @@ - + @@ -27,9 +27,9 @@ - - - + + + @@ -63,6 +63,7 @@ + @@ -70,8 +71,8 @@ - - + + @@ -79,26 +80,29 @@ - - + + - + + + + - - + + - - + + @@ -106,8 +110,8 @@ - - + + @@ -115,8 +119,8 @@ - - + + @@ -125,34 +129,34 @@ - - + + - - + + - - + + - - + + - + @@ -167,14 +171,14 @@ - - + + - - + + @@ -184,24 +188,24 @@ - - + + - - + + - - + + @@ -209,10 +213,12 @@ - - + + - + + + @@ -238,8 +244,9 @@ - + + diff --git a/syntax/julia.xml b/syntax/julia.xml --- a/syntax/julia.xml +++ b/syntax/julia.xml @@ -33,7 +33,7 @@ ]> - + @@ -697,7 +697,7 @@ - + diff --git a/syntax/kotlin.xml b/syntax/kotlin.xml --- a/syntax/kotlin.xml +++ b/syntax/kotlin.xml @@ -1,7 +1,7 @@ - + package @@ -260,11 +260,15 @@ - + + + - + + + @@ -291,8 +295,9 @@ - + + diff --git a/syntax/latex.xml b/syntax/latex.xml --- a/syntax/latex.xml +++ b/syntax/latex.xml @@ -3,9 +3,8 @@ [ - ]> - + @@ -390,7 +388,7 @@ - + @@ -402,7 +400,7 @@ - + @@ -415,7 +413,7 @@ - + @@ -437,10 +435,10 @@ - + - + @@ -461,10 +459,10 @@ - + - + @@ -479,7 +477,7 @@ - + @@ -492,10 +490,10 @@ - + - + @@ -629,17 +627,17 @@ - + - + - + @@ -651,19 +649,19 @@ - + - + - + @@ -671,7 +669,7 @@ - + @@ -691,7 +689,7 @@ - + @@ -773,13 +771,12 @@ - - + - + @@ -804,7 +801,7 @@ - + @@ -899,13 +896,12 @@ - - + - + @@ -925,7 +921,7 @@ - + @@ -951,7 +947,7 @@ - + @@ -964,11 +960,17 @@ - + + + + + + + @@ -1129,3 +1131,4 @@ + diff --git a/syntax/lex.xml b/syntax/lex.xml --- a/syntax/lex.xml +++ b/syntax/lex.xml @@ -20,7 +20,7 @@ ======================================================================== --> - + @@ -31,7 +31,7 @@ - + @@ -45,7 +45,10 @@ - + + + + @@ -142,3 +145,4 @@ + diff --git a/syntax/lilypond.xml b/syntax/lilypond.xml --- a/syntax/lilypond.xml +++ b/syntax/lilypond.xml @@ -56,7 +56,7 @@ ]> @@ -820,12 +820,16 @@ + + + + @@ -891,11 +895,13 @@ + + diff --git a/syntax/literate-curry.xml b/syntax/literate-curry.xml --- a/syntax/literate-curry.xml +++ b/syntax/literate-curry.xml @@ -1,6 +1,6 @@ - @@ -17,7 +17,7 @@ - + @@ -29,7 +29,9 @@ - + + + @@ -47,4 +49,9 @@ + + + + + diff --git a/syntax/literate-haskell.xml b/syntax/literate-haskell.xml --- a/syntax/literate-haskell.xml +++ b/syntax/literate-haskell.xml @@ -1,6 +1,6 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,9 @@ - + + + @@ -35,4 +37,9 @@ + + + + + diff --git a/syntax/llvm.xml b/syntax/llvm.xml --- a/syntax/llvm.xml +++ b/syntax/llvm.xml @@ -1,189 +1,189 @@ - begin - end - true - false - declare - define - global - constant - gc - module - asm - target - datalayout - null - undef - blockaddress - sideeffect - alignstack - to - unwind - nuw - nsw - inbounds - tail - triple - type - align - alias + begin + end + true + false + declare + define + global + constant + gc + module + asm + target + datalayout + null + undef + blockaddress + sideeffect + alignstack + to + unwind + nuw + nsw + inbounds + tail + triple + type + align + alias - private - internal - available_externally - linkonce - weak - common - appending - extern_weak - linkonce_odr - weak_odr - dllimport - dllexport + private + internal + available_externally + linkonce + weak + common + appending + extern_weak + linkonce_odr + weak_odr + dllimport + dllexport - ccc - fastcc - coldcc - cc + ccc + fastcc + coldcc + cc - default - hidden - protected + default + hidden + protected - zeroext - signext - inreg - byval - sret - noalias - nocapture - nest + zeroext + signext + inreg + byval + sret + noalias + nocapture + nest - alignstack - alwaysinline - inlinehint - naked - noimplicitfloat - noinline - noredzone - noreturn - nounwind - optnone - optsize - readnone - readonly - ssp - sspreq - sspstrong + alignstack + alwaysinline + inlinehint + naked + noimplicitfloat + noinline + noredzone + noreturn + nounwind + optnone + optsize + readnone + readonly + ssp + sspreq + sspstrong - float - double - fp128 - x86_fp80 - ppc_fp128 - x86mmx - void - label - metadata - opaque + float + double + fp128 + x86_fp80 + ppc_fp128 + x86mmx + void + label + metadata + opaque - llvm.used - llvm.compiler.used - llvm.global_ctors - llvm.global_dtors + llvm.used + llvm.compiler.used + llvm.global_ctors + llvm.global_dtors - ret - br - switch - indirectbr - invoke - unwind - unreachable - add - fadd - sub - fsub - mul - fmul - udiv - sdiv - fdiv - urem - srem - frem - shl - lshr - ashr - and - or - xor - extractelement - insertelement - shufflevector - extractvalue - insertvalue - alloca - load - store - getelementptr - trunc - zext - sext - fptrunc - fpext - fptoui - fptosi - uitofp - sitofp - ptrtoint - inttoptr - bitcast - addrspacecast - icmp - fcmp - phi - select - call - va_arg + ret + br + switch + indirectbr + invoke + unwind + unreachable + add + fadd + sub + fsub + mul + fmul + udiv + sdiv + fdiv + urem + srem + frem + shl + lshr + ashr + and + or + xor + extractelement + insertelement + shufflevector + extractvalue + insertvalue + alloca + load + store + getelementptr + trunc + zext + sext + fptrunc + fpext + fptoui + fptosi + uitofp + sitofp + ptrtoint + inttoptr + bitcast + addrspacecast + icmp + fcmp + phi + select + call + va_arg - eq - ne - ugt - uge - ult - ule - sgt - sge - slt - sle - oeq - ogt - oge - olt - ole - one - ord - ueq - une - uno + eq + ne + ugt + uge + ult + ule + sgt + sge + slt + sle + oeq + ogt + oge + olt + ole + one + ord + ueq + une + uno @@ -227,6 +227,7 @@ + @@ -235,11 +236,8 @@ - - - diff --git a/syntax/lua.xml b/syntax/lua.xml --- a/syntax/lua.xml +++ b/syntax/lua.xml @@ -48,7 +48,7 @@ - NOTE, FIXME, TODO alerts added on comments - improved highlighting --> - + and @@ -149,7 +149,7 @@ coroutine.create coroutine.isyieldable coroutine.resume - coroutine.kill + coroutine.close coroutine.running coroutine.status coroutine.wrap @@ -423,6 +423,8 @@ __call __tostring + __name + __close __pairs __metatable @@ -458,18 +460,17 @@ - + - - + - + - + @@ -477,6 +478,7 @@ + @@ -484,11 +486,11 @@ - + + + - - - + @@ -498,12 +500,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -556,14 +601,15 @@ + - + - + diff --git a/syntax/m4.xml b/syntax/m4.xml --- a/syntax/m4.xml +++ b/syntax/m4.xml @@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - + __gnu__ @@ -161,15 +161,20 @@ - + - + + + + + + @@ -191,3 +196,4 @@ + diff --git a/syntax/makefile.xml b/syntax/makefile.xml --- a/syntax/makefile.xml +++ b/syntax/makefile.xml @@ -10,7 +10,7 @@ @@ -185,8 +185,8 @@ - - + + @@ -203,10 +203,16 @@ - + + + + @@ -341,7 +347,8 @@ - + + @@ -456,6 +463,16 @@ + + + + + + + + + + @@ -495,4 +512,4 @@ - + diff --git a/syntax/markdown.xml b/syntax/markdown.xml --- a/syntax/markdown.xml +++ b/syntax/markdown.xml @@ -40,10 +40,12 @@ - + - + @@ -88,7 +90,7 @@ ]> - + @@ -318,7 +320,7 @@ - + diff --git a/syntax/mathematica.xml b/syntax/mathematica.xml --- a/syntax/mathematica.xml +++ b/syntax/mathematica.xml @@ -1,12 +1,13 @@ - + A AbelianGroup - All ArcSinh Abort AllowGroupClose @@ -94,7 +95,6 @@ AutoItalicWords AiryBiPrime AppendTo - Automatic AiryBiZero Apply AutoMultiplicationSymbol @@ -116,7 +116,6 @@ AlgebraicNumberTrace ArcCsch AxesLabel - Algebraics ArcSec AxesOrigin AlgebraicUnitQ @@ -142,7 +141,6 @@ BooleanMinterms Backward BilateralFilter - Booleans Band Binarize BooleanTable @@ -366,6 +364,7 @@ CellFrame ColorSeparate CoordinatesToolOptions + CellFrameColor CellFrameMargins ColorSetter CoprimeQ @@ -430,7 +429,6 @@ Complex CountryData Character - Complexes Covariance CharacterEncoding ComplexExpand @@ -910,7 +908,6 @@ FactorTermsList FindMaxValue FourierSinCoefficient - False FindMinimum FourierSinSeries FeedbackType @@ -1008,7 +1005,6 @@ FrontEndTokenExecute Find FontFamily - Full FindArgMax FontSize FullDefinition @@ -1260,7 +1256,6 @@ Information InverseErfc ImageClip - Inherited InverseFourier ImageColorSpace Initialization @@ -1350,7 +1345,6 @@ IntegerQ InverseWaveletTransform ImageRotate - Integers InverseWeierstrassP ImageScaled IntegerString @@ -1683,7 +1677,6 @@ MantissaExponent MaxStepSize Modal - Manual MaxValue ModularLambda Map @@ -1875,7 +1868,6 @@ NSum NextPrime NotebookSelection - Null NHoldAll NotebookWrite NullRecords @@ -1927,7 +1919,6 @@ NonConstants NotLess NumberPadding - None NotLessEqual NumberPoint NonlinearModelFit @@ -1952,6 +1943,7 @@ NotNestedLessLess NumericQ NormalDistribution + Nothing NotPrecedes NyquistGridLines Normalize @@ -2122,7 +2114,6 @@ PrimeQ ParallelTable PlotRange - Primes ParallelTry PlotRangeClipping PrimeZetaP @@ -2324,7 +2315,6 @@ Rationalize RescalingTransform RootSum - Rationals ResetDirectory Rotate Ratios @@ -2363,7 +2353,6 @@ RealExponent ReverseBiorthogonalSplineWavelet RowLines - Reals ReverseElement RowMinHeight Reap @@ -2856,7 +2845,6 @@ TrimmedMean Thin TotalVariationFilter - True Thinning TotalWidth TrueQ @@ -3080,6 +3068,8 @@ ZipfDistribution Zeta ZTest + + $ $Aborted $Inspector @@ -3198,32 +3188,133 @@ $InputFileName $Output + + + True + False + Automatic + All + None + Full + Inherited + Manual + Null + Anonymous + + + + Reals + Integers + Complexes + Algebraics + Primes + Rationals + Booleans + PositiveReals + NegativeReals + NonNegativeReals + NonPositiveReals + PositiveRationals + NegativeRationals + NonNegativeRationals + NonPositiveRationals + PositiveIntegers + NegativeIntegers + NonNegativeIntegers + NonPositiveIntegers + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - - - - + + + + + + + - + - + + diff --git a/syntax/matlab.xml b/syntax/matlab.xml --- a/syntax/matlab.xml +++ b/syntax/matlab.xml @@ -56,8 +56,8 @@ --> - - + + @@ -105,8 +105,8 @@ - - + + @@ -134,6 +134,14 @@ + + + + + + + + @@ -155,9 +163,10 @@ - + + diff --git a/syntax/maxima.xml b/syntax/maxima.xml --- a/syntax/maxima.xml +++ b/syntax/maxima.xml @@ -21,7 +21,7 @@ - + @@ -42,11 +42,6 @@ while - - FIXME - TODO - - abasep abs @@ -1871,9 +1866,10 @@ - + + @@ -1888,16 +1884,16 @@ - - + + diff --git a/syntax/mediawiki.xml b/syntax/mediawiki.xml --- a/syntax/mediawiki.xml +++ b/syntax/mediawiki.xml @@ -6,7 +6,7 @@ ]> - + @@ -15,7 +15,8 @@ - + + @@ -29,14 +30,14 @@ - + - + @@ -58,13 +59,15 @@ - + + - + + @@ -83,7 +86,8 @@ - + + @@ -101,7 +105,8 @@ - + + @@ -119,7 +124,8 @@ - + + @@ -137,6 +143,9 @@ + + + @@ -284,7 +293,8 @@ - + + @@ -306,7 +316,8 @@ - + + @@ -615,8 +626,9 @@ - + + diff --git a/syntax/metafont.xml b/syntax/metafont.xml --- a/syntax/metafont.xml +++ b/syntax/metafont.xml @@ -6,7 +6,7 @@ --> - @@ -914,7 +914,7 @@ - + @@ -940,8 +940,10 @@ + + @@ -977,10 +979,10 @@ - + - + diff --git a/syntax/mips.xml b/syntax/mips.xml --- a/syntax/mips.xml +++ b/syntax/mips.xml @@ -1,6 +1,6 @@ - + .align @@ -317,7 +317,7 @@ - + @@ -329,6 +329,11 @@ + + + + + @@ -352,8 +357,9 @@ - + + diff --git a/syntax/modelines.xml b/syntax/modelines.xml --- a/syntax/modelines.xml +++ b/syntax/modelines.xml @@ -8,7 +8,7 @@ Copyright (c) 2012-2014 by Alex Turbov (i.zaufi@gmail.com) --> - - + - + @@ -139,7 +138,6 @@ - @@ -147,28 +145,24 @@ - - - - diff --git a/syntax/modula-2.xml b/syntax/modula-2.xml --- a/syntax/modula-2.xml +++ b/syntax/modula-2.xml @@ -1,6 +1,6 @@ - + + + @@ -1121,6 +1124,10 @@ + + + + @@ -1182,10 +1189,9 @@ - - + - + diff --git a/syntax/modula-3.xml b/syntax/modula-3.xml --- a/syntax/modula-3.xml +++ b/syntax/modula-3.xml @@ -6,259 +6,259 @@ - + - - ANY - ARRAY - AS - BEGIN - BITS - BRANDED - BY - CASE - CONST - - DO - ELSE - ELSIF - END - EVAL - EXCEPT - EXCEPTION - EXIT - EXPORTS - FINALLY - FOR - FROM - GENERIC - IF - IMPORT - - INTERFACE - LOCK - LOOP - METHODS - - MODULE - - OBJECT - OF - - OVERRIDES - PROCEDURE - RAISE - RAISES - READONLY - RECORD - REF - REPEAT - RETURN - REVEAL - ROOT - SET - THEN - TO - TRY - TYPE - TYPECASE - UNSAFE - UNTIL - UNTRACED - VALUE - VAR - WHILE - WITH + + ANY + ARRAY + AS + BEGIN + BITS + BRANDED + BY + CASE + CONST + + DO + ELSE + ELSIF + END + EVAL + EXCEPT + EXCEPTION + EXIT + EXPORTS + FINALLY + FOR + FROM + GENERIC + IF + IMPORT + + INTERFACE + LOCK + LOOP + METHODS + + MODULE + + OBJECT + OF + + OVERRIDES + PROCEDURE + RAISE + RAISES + READONLY + RECORD + REF + REPEAT + RETURN + REVEAL + ROOT + SET + THEN + TO + TRY + TYPE + TYPECASE + UNSAFE + UNTIL + UNTRACED + VALUE + VAR + WHILE + WITH - AND - DIV - IN - MOD - NOT - OR - + - < - # - = - ; - .. - : - - - > - { - } - | - := - <: - * - <= - ( - ) - ^ - , - => - / - >= - [ - ] - . - & + AND + DIV + IN + MOD + NOT + OR + + + < + # + = + ; + .. + : + - + > + { + } + | + := + <: + * + <= + ( + ) + ^ + , + => + / + >= + [ + ] + . + & - ADDRESS - BOOLEAN - CARDINAL - CHAR - EXTENDED - INTEGER - LONGREAL - MUTEX - NULL - REAL - REFANY - T - TEXT + ADDRESS + BOOLEAN + CARDINAL + CHAR + EXTENDED + INTEGER + LONGREAL + MUTEX + NULL + REAL + REFANY + T + TEXT - FALSE - NIL - TRUE + FALSE + NIL + TRUE - ABS - ADR - ADRSIZE - BITSIZE - BYTESIZE - CEILING - DEC - DISPOSE - FIRST - FLOAT - FLOOR - INC - ISTYPE - LAST - LOOPHOLE - MAX - MIN - NARROW - NEW - NUMBER - ORD - ROUND - SUBARRAY - TRUNC - TYPECODE - VAL + ABS + ADR + ADRSIZE + BITSIZE + BYTESIZE + CEILING + DEC + DISPOSE + FIRST + FLOAT + FLOOR + INC + ISTYPE + LAST + LOOPHOLE + MAX + MIN + NARROW + NEW + NUMBER + ORD + ROUND + SUBARRAY + TRUNC + TYPECODE + VAL - Text - Text.Length - Text.Empty - Text.Equal - Text.Compare - Text.Cat - Text.Sub - Text.Hash - Text.HasWideChar - Text.GetChar - Text.GetWideChar - Text.SetChars - Text.SetWideChars - Text.FromChars - Text.FromWideChars - Text.FindChar - Text.FindWideChar - Text.FindCharR - Text.FindWideCharR - Fmt - Fmt.Bool - Fmt.Char - Fmt.Int - Fmt.Unsigned - Fmt.Real - Fmt.LongReal - Fmt.Extended - Fmt.Pad - Fmt.F - Fmt.FN - Scan - Scan.Bool - Scan.Int - Scan.Unsigned - Scan.Real - Scan.LongReal - Scan.Extended - IO - IO.Put - IO.PutChar - IO.PutWideChar - IO.PutInt - IO.PutReal - IO.EOF - IO.GetLine - IO.GetChar - IO.GetWideChar - IO.GetInt - IO.GetReal - IO.OpenRead - IO.OpenWrite - Rd - Rd.GetChar - Rd.GetWideChar - Rd.EOF - Rd.UnGetChar - Rd.CharsReady - Rd.GetSub - Rd.GetWideSub - Rd.GetSubLine - Rd.GetWideSubLine - Rd.GetText - Rd.GetWideText - Rd.GetLine - Rd.GetWideLine - Rd.Seek - Rd.Close - Rd.Index - Rd.Length - Rd.Intermittend - Rd.Seekable - Rd.Closed - Wr - Wr.PutChar - Wr.PutWideChar - Wr.PutText - Wr.PutWideText - Wr.PutString - Wr.PutWideString - Wr.Seek - Wr.Flush - Wr.Close - Wr.Length - Wr.Index - Wr.Seekable - Wr.Closed - Wr.Buffered - Lex - Lex.Scan - Lex.Skip - Lex.Match - Lex.Bool - Lex.Int - Lex.Unsigned - Lex.Real - Lex.LongReal - Lex.Extended - Params - Params.Count - Params.Get - Env - Env.Count - Env.Get - Env.GetNth + Text + Text.Length + Text.Empty + Text.Equal + Text.Compare + Text.Cat + Text.Sub + Text.Hash + Text.HasWideChar + Text.GetChar + Text.GetWideChar + Text.SetChars + Text.SetWideChars + Text.FromChars + Text.FromWideChars + Text.FindChar + Text.FindWideChar + Text.FindCharR + Text.FindWideCharR + Fmt + Fmt.Bool + Fmt.Char + Fmt.Int + Fmt.Unsigned + Fmt.Real + Fmt.LongReal + Fmt.Extended + Fmt.Pad + Fmt.F + Fmt.FN + Scan + Scan.Bool + Scan.Int + Scan.Unsigned + Scan.Real + Scan.LongReal + Scan.Extended + IO + IO.Put + IO.PutChar + IO.PutWideChar + IO.PutInt + IO.PutReal + IO.EOF + IO.GetLine + IO.GetChar + IO.GetWideChar + IO.GetInt + IO.GetReal + IO.OpenRead + IO.OpenWrite + Rd + Rd.GetChar + Rd.GetWideChar + Rd.EOF + Rd.UnGetChar + Rd.CharsReady + Rd.GetSub + Rd.GetWideSub + Rd.GetSubLine + Rd.GetWideSubLine + Rd.GetText + Rd.GetWideText + Rd.GetLine + Rd.GetWideLine + Rd.Seek + Rd.Close + Rd.Index + Rd.Length + Rd.Intermittend + Rd.Seekable + Rd.Closed + Wr + Wr.PutChar + Wr.PutWideChar + Wr.PutText + Wr.PutWideText + Wr.PutString + Wr.PutWideString + Wr.Seek + Wr.Flush + Wr.Close + Wr.Length + Wr.Index + Wr.Seekable + Wr.Closed + Wr.Buffered + Lex + Lex.Scan + Lex.Skip + Lex.Match + Lex.Bool + Lex.Int + Lex.Unsigned + Lex.Real + Lex.LongReal + Lex.Extended + Params + Params.Count + Params.Get + Env + Env.Count + Env.Get + Env.GetNth @@ -285,6 +285,9 @@ + + + @@ -309,7 +312,8 @@ - + + diff --git a/syntax/monobasic.xml b/syntax/monobasic.xml --- a/syntax/monobasic.xml +++ b/syntax/monobasic.xml @@ -10,7 +10,7 @@ License: GNU General Public License --> - + Option @@ -192,7 +192,11 @@ - + + + + + diff --git a/syntax/mustache.xml b/syntax/mustache.xml --- a/syntax/mustache.xml +++ b/syntax/mustache.xml @@ -36,13 +36,14 @@ (via IncludeRules) in the HTML highlighter. Change log: + * v5 [2020-08-15]: Use Handlebars comment en the group. * v3 [2019-10-03]: Minor fixes. * v2 [2019-02-24]: Also highlight template files (HTML). Improve support for Handlebars. * v1 [2019-02-10]: Initial version --> - + Start: \{\{~?#?\s*(?=(?:if|unless|with|link\-to|each(?:\-in)?)\b) + End: \{\{~?/\s*(?=(?:if|unless|with|link\-to|each(?:\-in)?)\b) --> - + @@ -161,13 +162,17 @@ - - + + + + + + @@ -274,7 +279,9 @@ + + @@ -380,6 +387,8 @@ + + @@ -463,7 +472,7 @@ - + diff --git a/syntax/nasm.xml b/syntax/nasm.xml --- a/syntax/nasm.xml +++ b/syntax/nasm.xml @@ -1,892 +1,2782 @@ - - - - - - - eax - ax - ah - al - ebx - bx - bh - bl - ecx - cx - ch - cl - edx - dx - dh - dl - ebp - bp - esi - si - edi - di - - esp - sp - - cs - ds - es - fs - gs - ss - - cr0 - - cr2 - cr3 - cr4 - - dr0 - dr1 - dr2 - dr3 - dr6 - dr7 - - st - - mm0 - mm1 - mm2 - mm3 - mm4 - mm5 - mm6 - mm7 - - xmm0 - xmm1 - xmm2 - xmm3 - xmm4 - xmm5 - xmm6 - xmm7 - - - aaa - aad - aam - aas - adc - add - addpd - addps - addsd - addss - addsubpd - addsubps - and - andnpd - andnps - andpd - andps - arpl - bound - bsf - bsr - bswap - bt - btc - btr - bts - call - cbw - cwde - cwd - cdq - cdqe - cqo - clc - cld - clgi - cli - clts - clflush - cmc - cmova - cmovae - cmovb - cmovbe - cmovc - cmove - cmovg - cmovge - cmovl - cmovle - cmovna - cmovnae - cmovnb - cmovnbe - cmovnc - cmovne - cmovng - cmovnge - cmovnl - cmovnle - cmovno - cmovnp - cmovns - cmovnz - cmovo - cmovp - cmovpe - cmovpo - cmovs - cmovz - cmp - cmpeqpd - cmpeqps - cmpeqsd - cmpeqss - cmplepd - cmpleps - cmplesd - cmpless - cmpltpd - cmpltps - cmpltsd - cmpltss - cmpneqpd - cmpneqps - cmpneqsd - cmpneqss - cmpnlepd - cmpnleps - cmpnlesd - cmpnless - cmpnltpd - cmpnltps - cmpnltsd - cmpnltss - cmpordpd - cmpordps - cmpordsd - cmpordss - cmppd - cmpps - cmps - cmpsb - cmpsd - cmpss - cmpsw - cmpunordpd - cmpunordps - cmpunordsd - cmpunordss - cmpxchg - cmpxchg486 - cmpxchg8b - cmpxchg16b - comisd - comiss - cpuid - cvtdq2pd - cvtdq2ps - cvtpd2dq - cvtpd2pi - cvtpd2ps - cvtpi2pd - cvtpi2ps - cvtps2dq - cvtps2pd - cvtps2pi - cvtsd2si - cvtsd2ss - cvtsi2sd - cvtsi2ss - cvtss2sd - cvtss2si - cvttpd2dq - cvttpd2pi - cvttps2dq - cvttps2pi - cvttsd2si - cvttss2si - daa - das - dec - div - divpd - divps - divsd - divss - emms - enter - f2xm1 - fabs - fadd - faddp - fbld - fbstp - fchs - fclex - fnclex - fcmovb - fcmovbe - fcmove - fcmovnb - fcmovnbe - fcmovne - fcmovnu - fcmovu - fcom - fcomp - fcompp - fcomi - fcomip - fcos - fdecstp - fdisi - feni - fdiv - fdivr - fdivp - fdivrp - femms - ffree - ffreep - fiadd - ficom - ficomp - fidiv - fidivr - fild - fimul - fincstp - finit - fist - fistp - fisttp - fisub - fisubr - fld - fld1 - fldl2e - fldl2t - fldlg2 - fldln2 - fldcw - fldenv - fldpi - fldz - fmul - fmulp - fndisi - fneni - fninit - fnop - fnsave - fnstcw - fnstenv - fnstsw - fnwait - fpatan - fptan - fprem - fprem1 - frndint - frstor - fsave - fscale - fsetpm - fsin - fsincos - fsqrt - fst - fstp - fstcw - fstenv - fstsw - fsub - fsubr - fsubp - fsubrp - ftst - fucom - fucomp - fucompp - fucomi - fucomip - fwait - fxam - fxch - fxrstor - fxsave - fxtract - fyl2x - fyl2xp1 - haddpd - haddps - hlt - hsubpd - hsubps - ibts - idiv - imul - in - inc - ins - insb - insd - insw - int - int1 - int3 - into - invd - invlpg - invlpga - iret - iretd - iretq - iretw - ja - jae - jb - jbe - jc - je - jg - jge - jl - jle - jna - jnae - jnb - jnbe - jnc - jne - jng - jnge - jnl - jnle - jno - jnp - jns - jnz - jo - jp - jpe - jpo - js - jz - jcxz - jecxz - jrcxz - jmp - lahf - lar - lddqu - ldmxcsr - lds - les - lea - leave - lfence - lfs - lgdt - lgs - lidt - lldt - lmsw - loadall - loadall286 - lods - lodsb - lodsd - lodsq - lodsw - loop - loope - loopne - loopnz - loopz - lsl - lss - ltr - maskmovdqu - maskmovq - maxpd - maxps - maxsd - maxss - mfence - minpd - minps - minsd - minss - monitor - mov - movapd - movaps - movd - movddup - movdq2q - movdqa - movdqu - movhlps - movhpd - movhps - movlhps - movlpd - movlps - movmskpd - movmskps - movntdq - movnti - movntpd - movntps - movntq - movq - movq2dq - movs - movsb - movsd - movshdup - movsldup - movsq - movss - movsx - movsxd - movsw - movupd - movups - movzx - mul - mulpd - mulps - mulsd - mulss - mwait - neg - nop - not - or - orpd - orps - out - outs - outsb - outsw - outsd - packssdw - packsswb - packuswb - paddb - paddd - paddq - paddsb - paddsw - paddusb - paddusw - paddw - pand - pandn - pause - pavgb - pavgusb - pavgw - pcmpeqb - pcmpeqw - pcmpeqd - pcmpgtb - pcmpgtw - pcmpgtd - pdistib - pextrw - pf2id - pf2iw - pfacc - pfadd - pfcmpeq - pfcmpge - pfcmpgt - pfmax - pfmin - pfmul - pfnacc - pfpnacc - pfrcp - pfrcpit1 - pfrcpit2 - pfrsqit1 - pfrsqrt - pfsub - pfsubr - pi2fd - pi2fw - pinsrw - pmachriw - pmaddwd - pmagw - pmaxsw - pmaxub - pminsw - pminub - pmovmskb - pmulhrw - pmulhuw - pmulhw - pmullw - pmuludq - pmvgezb - pmvlzb - pmvnzb - pmvzb - pop - popa - popaw - popad - popf - popfw - popfd - popfq - por - prefetch - prefetchnta - prefetcht0 - prefetcht1 - prefetcht2 - prefetchw - psadbw - pshufd - pshufhw - pshuflw - pshufw - pslld - pslldq - psllq - psllw - psrad - psraw - psrld - psrldq - psrlq - psrlw - psubb - psubd - psubq - psubsb - psubsiw - psubsw - psubusb - psubusw - psubw - pswapd - punpckhbw - punpckhdq - punpckhqdq - punpckhwd - punpcklbw - punpckldq - punpcklqdq - punpcklwd - push - pusha - pushad - pushaw - pushf - pushfd - pushfq - pushfw - pxor - rcl - rcr - rcpps - rcpss - rdmsr - rdpmc - rdshr - rdtsc - rdtscp - ret - retf - retn - rol - ror - rsdc - rsldt - rsm - rsqrtps - rsqrtss - rsts - sahf - sal - sar - salc - sbb - scas - scasb - scasd - scasq - scasw - seta - setae - setb - setbe - setc - sete - setg - setge - setl - setle - setna - setnae - setnb - setnbe - setnc - setne - setng - setnge - setnl - setnle - setno - setnp - setns - setnz - seto - setp - setpe - setpo - sets - setz - sfence - sgdt - shl - shld - shr - shrd - shufpd - shufps - sidt - skinit - sldt - smi - smint - smintold - smsw - sqrtpd - sqrtps - sqrtsd - sqrtss - stc - std - stgi - sti - stmxcsr - stos - stosb - stosd - stosq - stosw - str - sub - subpd - subps - subsd - subss - svdc - svldt - svts - swapgs - syscall - sysenter - sysexit - sysret - test - ucomisd - ucomiss - ud0 - ud1 - ud2 - umov - unpckhpd - unpckhps - unpcklpd - unpcklps - verr - verw - vmload - vmmcall - vmrun - vmsave - wait - wbinvd - wrmsr - wrshr - xadd - xbts - xchg - xlat - xlatb - xor - xorpd - xorps - - - - times - - equ - - db - dw - dd - dq - dt - - resb - resw - resd - resq - rest - - incbin - - byte - word - dword - qword - short - ptr - - - - absolute - bits - common - extern - global - org - section - seg - segment - strict - use16 - use32 - wrt - - struc - endstruc - istruc - at - iend - align - alignb - - __SECT__ - __NASM_MAJOR__ - __NASM_MINOR__ - __NASM_SUBMINOR__ - ___NASM_PATCHLEVEL__ - __NASM_VERSION_ID__ - __NASM_VER__ - __FILE__ - __LINE__ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +]> + + + + + + rax + eax + ax + ah + al + rbx + ebx + bx + bh + bl + rcx + ecx + cx + ch + cl + rdx + edx + dx + dh + dl + rbp + ebp + bp + bpl + rsi + esi + si + sil + rdi + edi + di + dil + + rip + eip + ip + + rsp + esp + sp + spl + r8 + r8d + r8w + r8b + r9 + r9d + r9w + r9b + r10 + r10d + r10w + r10b + r11 + r11d + r11w + r11b + r12 + r12d + r12w + r12b + r13 + r13d + r13w + r13b + r14 + r14d + r14w + r14b + r15 + r15d + r15w + r15b + + cs + ds + es + fs + gs + ss + + cr0 + + cr2 + cr3 + cr4 + + dr0 + dr1 + dr2 + dr3 + dr6 + dr7 + + st + + mm0 + mm1 + mm2 + mm3 + mm4 + mm5 + mm6 + mm7 + + xmm0 + xmm1 + xmm2 + xmm3 + xmm4 + xmm5 + xmm6 + xmm7 + xmm8 + xmm9 + xmm10 + xmm11 + xmm12 + xmm13 + xmm14 + xmm15 + xmm16 + xmm17 + xmm18 + xmm19 + xmm20 + xmm21 + xmm22 + xmm23 + xmm24 + xmm25 + xmm26 + xmm27 + xmm28 + xmm29 + xmm30 + xmm31 + + ymm0 + ymm1 + ymm2 + ymm3 + ymm4 + ymm5 + ymm6 + ymm7 + ymm8 + ymm9 + ymm10 + ymm11 + ymm12 + ymm13 + ymm14 + ymm15 + ymm16 + ymm17 + ymm18 + ymm19 + ymm20 + ymm21 + ymm22 + ymm23 + ymm24 + ymm25 + ymm26 + ymm27 + ymm28 + ymm29 + ymm30 + ymm31 + + zmm0 + zmm1 + zmm2 + zmm3 + zmm4 + zmm5 + zmm6 + zmm7 + zmm8 + zmm9 + zmm10 + zmm11 + zmm12 + zmm13 + zmm14 + zmm15 + zmm16 + zmm17 + zmm18 + zmm19 + zmm20 + zmm21 + zmm22 + zmm23 + zmm24 + zmm25 + zmm26 + zmm27 + zmm28 + zmm29 + zmm30 + zmm31 + + + + aaa + aad + aam + aas + adc + adcx + add + addpd + addps + addsd + addss + addsubpd + addsubps + adox + aesdec + aesdeclast + aesenc + aesenclast + aesimc + aeskeygenassist + and + andn + andnpd + andnps + andpd + andps + arpl + bb0_reset + bb1_reset + bextr + blcfill + blci + blcic + blcmsk + blcs + blendpd + blendps + blendvpd + blendvps + blsfill + blsi + blsic + blsmsk + blsr + bndcl + bndcn + bndcu + bndldx + bndmk + bndmov + bndstx + bound + bsf + bsr + bswap + bt + btc + btr + bts + bzhi + cbw + cdq + cdqe + clac + clc + cld + cldemote + clflush + clflushopt + clgi + cli + clrssbsy + clts + clwb + clzero + cmc + cmova + cmovae + cmovb + cmovbe + cmovc + cmove + cmovg + cmovge + cmovl + cmovle + cmovna + cmovnae + cmovnb + cmovnbe + cmovnc + cmovne + cmovng + cmovnge + cmovnl + cmovnle + cmovno + cmovnp + cmovns + cmovnz + cmovo + cmovp + cmovpe + cmovpo + cmovs + cmovz + cmp + cmpeqpd + cmpeqps + cmpeqsd + cmpeqss + cmplepd + cmpleps + cmplesd + cmpless + cmpltpd + cmpltps + cmpltsd + cmpltss + cmpneqpd + cmpneqps + cmpneqsd + cmpneqss + cmpnlepd + cmpnleps + cmpnlesd + cmpnless + cmpnltpd + cmpnltps + cmpnltsd + cmpnltss + cmpordpd + cmpordps + cmpordsd + cmpordss + cmppd + cmpps + cmpsb + cmpsd + cmpsq + cmpss + cmpsw + cmpunordpd + cmpunordps + cmpunordsd + cmpunordss + cmpxchg + cmpxchg16b + cmpxchg486 + cmpxchg8b + comisd + comiss + cpuid + cpu_read + cpu_write + cqo + crc32 + cvtdq2pd + cvtdq2ps + cvtpd2dq + cvtpd2pi + cvtpd2ps + cvtpi2pd + cvtpi2ps + cvtps2dq + cvtps2pd + cvtps2pi + cvtsd2si + cvtsd2ss + cvtsi2sd + cvtsi2ss + cvtss2sd + cvtss2si + cvttpd2dq + cvttpd2pi + cvttps2dq + cvttps2pi + cvttsd2si + cvttss2si + cwd + cwde + daa + das + dec + div + divpd + divps + divsd + divss + dmint + dppd + dpps + emms + encls + enclu + enclv + endbr32 + endbr64 + enqcmd + enqcmds + enter + extractps + extrq + f2xm1 + fabs + fadd + faddp + fbld + fbstp + fchs + fclex + fcmovb + fcmovbe + fcmove + fcmovnb + fcmovnbe + fcmovne + fcmovnu + fcmovu + fcom + fcomi + fcomip + fcomp + fcompp + fcos + fdecstp + fdisi + fdiv + fdivp + fdivr + fdivrp + femms + feni + ffree + ffreep + fiadd + ficom + ficomp + fidiv + fidivr + fild + fimul + fincstp + finit + fist + fistp + fisttp + fisub + fisubr + fld + fld1 + fldcw + fldenv + fldl2e + fldl2t + fldlg2 + fldln2 + fldpi + fldz + fmul + fmulp + fnclex + fndisi + fneni + fninit + fnop + fnsave + fnstcw + fnstenv + fnstsw + fpatan + fprem + fprem1 + fptan + frndint + frstor + fsave + fscale + fsetpm + fsin + fsincos + fsqrt + fst + fstcw + fstenv + fstp + fstsw + fsub + fsubp + fsubr + fsubrp + ftst + fucom + fucomi + fucomip + fucomp + fucompp + fwait + fxam + fxch + fxrstor + fxrstor64 + fxsave + fxsave64 + fxtract + fyl2x + fyl2xp1 + getsec + gf2p8affineinvqb + gf2p8affineqb + gf2p8mulb + haddpd + haddps + hint_nop0 + hint_nop1 + hint_nop10 + hint_nop11 + hint_nop12 + hint_nop13 + hint_nop14 + hint_nop15 + hint_nop16 + hint_nop17 + hint_nop18 + hint_nop19 + hint_nop2 + hint_nop20 + hint_nop21 + hint_nop22 + hint_nop23 + hint_nop24 + hint_nop25 + hint_nop26 + hint_nop27 + hint_nop28 + hint_nop29 + hint_nop3 + hint_nop30 + hint_nop31 + hint_nop32 + hint_nop33 + hint_nop34 + hint_nop35 + hint_nop36 + hint_nop37 + hint_nop38 + hint_nop39 + hint_nop4 + hint_nop40 + hint_nop41 + hint_nop42 + hint_nop43 + hint_nop44 + hint_nop45 + hint_nop46 + hint_nop47 + hint_nop48 + hint_nop49 + hint_nop5 + hint_nop50 + hint_nop51 + hint_nop52 + hint_nop53 + hint_nop54 + hint_nop55 + hint_nop56 + hint_nop57 + hint_nop58 + hint_nop59 + hint_nop6 + hint_nop60 + hint_nop61 + hint_nop62 + hint_nop63 + hint_nop7 + hint_nop8 + hint_nop9 + hlt + hsubpd + hsubps + ibts + icebp + idiv + imul + in + inc + incsspd + incsspq + insb + insd + insertps + insertq + insw + int + int01 + int03 + int1 + int3 + into + invd + invept + invlpg + invlpga + invpcid + invvpid + kadd + kaddb + kaddd + kaddq + kaddw + kand + kandb + kandd + kandn + kandnb + kandnd + kandnq + kandnw + kandq + kandw + kmov + kmovb + kmovd + kmovq + kmovw + knot + knotb + knotd + knotq + knotw + kor + korb + kord + korq + kortest + kortestb + kortestd + kortestq + kortestw + korw + kshiftl + kshiftlb + kshiftld + kshiftlq + kshiftlw + kshiftr + kshiftrb + kshiftrd + kshiftrq + kshiftrw + ktest + ktestb + ktestd + ktestq + ktestw + kunpck + kunpckbw + kunpckdq + kunpckwd + kxnor + kxnorb + kxnord + kxnorq + kxnorw + kxor + kxorb + kxord + kxorq + kxorw + lahf + lar + lddqu + ldmxcsr + lds + ldtilecfg + lea + leave + les + lfence + lfs + lgdt + lgs + lidt + lldt + llwpcb + lmsw + loadall + loadall286 + lodsb + lodsd + lodsq + lodsw + loop + loope + loopne + loopnz + loopz + lsl + lss + ltr + lwpins + lwpval + lzcnt + maskmovdqu + maskmovq + maxpd + maxps + maxsd + maxss + mfence + minpd + minps + minsd + minss + monitor + monitorx + montmul + mov + movapd + movaps + movbe + movd + movddup + movdir64b + movdiri + movdq2q + movdqa + movdqu + movhlps + movhpd + movhps + movlhps + movlpd + movlps + movmskpd + movmskps + movntdq + movntdqa + movnti + movntpd + movntps + movntq + movntsd + movntss + movq + movq2dq + movsb + movsd + movshdup + movsldup + movsq + movss + movsw + movsx + movsxd + movupd + movups + movzx + mpsadbw + mul + mulpd + mulps + mulsd + mulss + mulx + mwait + mwaitx + neg + nop + not + or + orpd + orps + out + outsb + outsd + outsw + pabsb + pabsd + pabsw + packssdw + packsswb + packusdw + packuswb + paddb + paddd + paddq + paddsb + paddsiw + paddsw + paddusb + paddusw + paddw + palignr + pand + pandn + pause + paveb + pavgb + pavgusb + pavgw + pblendvb + pblendw + pclmulhqhqdq + pclmulhqlqdq + pclmullqhqdq + pclmullqlqdq + pclmulqdq + pcmpeqb + pcmpeqd + pcmpeqq + pcmpeqw + pcmpestri + pcmpestrm + pcmpgtb + pcmpgtd + pcmpgtq + pcmpgtw + pcmpistri + pcmpistrm + pcommit + pconfig + pdep + pdistib + pext + pextrb + pextrd + pextrq + pextrw + pf2id + pf2iw + pfacc + pfadd + pfcmpeq + pfcmpge + pfcmpgt + pfmax + pfmin + pfmul + pfnacc + pfpnacc + pfrcp + pfrcpit1 + pfrcpit2 + pfrcpv + pfrsqit1 + pfrsqrt + pfrsqrtv + pfsub + pfsubr + phaddd + phaddsw + phaddw + phminposuw + phsubd + phsubsw + phsubw + pi2fd + pi2fw + pinsrb + pinsrd + pinsrq + pinsrw + pmachriw + pmaddubsw + pmaddwd + pmagw + pmaxsb + pmaxsd + pmaxsw + pmaxub + pmaxud + pmaxuw + pminsb + pminsd + pminsw + pminub + pminud + pminuw + pmovmskb + pmovsxbd + pmovsxbq + pmovsxbw + pmovsxdq + pmovsxwd + pmovsxwq + pmovzxbd + pmovzxbq + pmovzxbw + pmovzxdq + pmovzxwd + pmovzxwq + pmuldq + pmulhriw + pmulhrsw + pmulhrwa + pmulhrwc + pmulhuw + pmulhw + pmulld + pmullw + pmuludq + pmvgezb + pmvlzb + pmvnzb + pmvzb + pop + popa + popad + popaw + popcnt + popf + popfd + popfq + popfw + por + prefetch + prefetchnta + prefetcht0 + prefetcht1 + prefetcht2 + prefetchw + prefetchwt1 + psadbw + pshufb + pshufd + pshufhw + pshuflw + pshufw + psignb + psignd + psignw + pslld + pslldq + psllq + psllw + psrad + psraw + psrld + psrldq + psrlq + psrlw + psubb + psubd + psubq + psubsb + psubsiw + psubsw + psubusb + psubusw + psubw + pswapd + ptest + ptwrite + punpckhbw + punpckhdq + punpckhqdq + punpckhwd + punpcklbw + punpckldq + punpcklqdq + punpcklwd + push + pusha + pushad + pushaw + pushf + pushfd + pushfq + pushfw + pxor + rcl + rcpps + rcpss + rcr + rdfsbase + rdgsbase + rdm + rdmsr + rdpid + rdpkru + rdpmc + rdrand + rdseed + rdshr + rdsspd + rdsspq + rdtsc + rdtscp + rol + ror + rorx + roundpd + roundps + roundsd + roundss + rsdc + rsldt + rsm + rsqrtps + rsqrtss + rstorssp + rsts + sahf + sal + salc + sar + sarx + saveprevssp + sbb + scasb + scasd + scasq + scasw + serialize + seta + setae + setb + setbe + setc + sete + setg + setge + setl + setle + setna + setnae + setnb + setnbe + setnc + setne + setng + setnge + setnl + setnle + setno + setnp + setns + setnz + seto + setp + setpe + setpo + sets + setssbsy + setz + sfence + sgdt + sha1msg1 + sha1msg2 + sha1nexte + sha1rnds4 + sha256msg1 + sha256msg2 + sha256rnds2 + shl + shld + shlx + shr + shrd + shrx + shufpd + shufps + sidt + skinit + sldt + slwpcb + smi + smint + smintold + smsw + sqrtpd + sqrtps + sqrtsd + sqrtss + stac + stc + std + stgi + sti + stmxcsr + stosb + stosd + stosq + stosw + str + sttilecfg + sub + subpd + subps + subsd + subss + svdc + svldt + svts + swapgs + syscall + sysenter + sysexit + sysret + t1mskc + tdpbf16ps + tdpbssd + tdpbsud + tdpbusd + tdpbuud + test + tileloadd + tileloaddt1 + tilerelease + tilestored + tilezero + tpause + tzcnt + tzmsk + ucomisd + ucomiss + ud0 + ud1 + ud2 + ud2a + ud2b + umonitor + umov + umwait + unpckhpd + unpckhps + unpcklpd + unpcklps + v4dpwssd + v4dpwssds + v4fmaddps + v4fmaddss + v4fnmaddps + v4fnmaddss + vaddpd + vaddps + vaddsd + vaddss + vaddsubpd + vaddsubps + vaesdec + vaesdeclast + vaesenc + vaesenclast + vaesimc + vaeskeygenassist + valignd + valignq + vandnpd + vandnps + vandpd + vandps + vblendmpd + vblendmps + vblendpd + vblendps + vblendvpd + vblendvps + vbroadcastf128 + vbroadcastf32x2 + vbroadcastf32x4 + vbroadcastf32x8 + vbroadcastf64x2 + vbroadcastf64x4 + vbroadcasti128 + vbroadcasti32x2 + vbroadcasti32x4 + vbroadcasti32x8 + vbroadcasti64x2 + vbroadcasti64x4 + vbroadcastsd + vbroadcastss + vcmpeqpd + vcmpeqps + vcmpeqsd + vcmpeqss + vcmpeq_oqpd + vcmpeq_oqps + vcmpeq_oqsd + vcmpeq_oqss + vcmpeq_ospd + vcmpeq_osps + vcmpeq_ossd + vcmpeq_osss + vcmpeq_uqpd + vcmpeq_uqps + vcmpeq_uqsd + vcmpeq_uqss + vcmpeq_uspd + vcmpeq_usps + vcmpeq_ussd + vcmpeq_usss + vcmpfalsepd + vcmpfalseps + vcmpfalsesd + vcmpfalsess + vcmpfalse_oqpd + vcmpfalse_oqps + vcmpfalse_oqsd + vcmpfalse_oqss + vcmpfalse_ospd + vcmpfalse_osps + vcmpfalse_ossd + vcmpfalse_osss + vcmpgepd + vcmpgeps + vcmpgesd + vcmpgess + vcmpge_oqpd + vcmpge_oqps + vcmpge_oqsd + vcmpge_oqss + vcmpge_ospd + vcmpge_osps + vcmpge_ossd + vcmpge_osss + vcmpgtpd + vcmpgtps + vcmpgtsd + vcmpgtss + vcmpgt_oqpd + vcmpgt_oqps + vcmpgt_oqsd + vcmpgt_oqss + vcmpgt_ospd + vcmpgt_osps + vcmpgt_ossd + vcmpgt_osss + vcmplepd + vcmpleps + vcmplesd + vcmpless + vcmple_oqpd + vcmple_oqps + vcmple_oqsd + vcmple_oqss + vcmple_ospd + vcmple_osps + vcmple_ossd + vcmple_osss + vcmpltpd + vcmpltps + vcmpltsd + vcmpltss + vcmplt_oqpd + vcmplt_oqps + vcmplt_oqsd + vcmplt_oqss + vcmplt_ospd + vcmplt_osps + vcmplt_ossd + vcmplt_osss + vcmpneqpd + vcmpneqps + vcmpneqsd + vcmpneqss + vcmpneq_oqpd + vcmpneq_oqps + vcmpneq_oqsd + vcmpneq_oqss + vcmpneq_ospd + vcmpneq_osps + vcmpneq_ossd + vcmpneq_osss + vcmpneq_uqpd + vcmpneq_uqps + vcmpneq_uqsd + vcmpneq_uqss + vcmpneq_uspd + vcmpneq_usps + vcmpneq_ussd + vcmpneq_usss + vcmpngepd + vcmpngeps + vcmpngesd + vcmpngess + vcmpnge_uqpd + vcmpnge_uqps + vcmpnge_uqsd + vcmpnge_uqss + vcmpnge_uspd + vcmpnge_usps + vcmpnge_ussd + vcmpnge_usss + vcmpngtpd + vcmpngtps + vcmpngtsd + vcmpngtss + vcmpngt_uqpd + vcmpngt_uqps + vcmpngt_uqsd + vcmpngt_uqss + vcmpngt_uspd + vcmpngt_usps + vcmpngt_ussd + vcmpngt_usss + vcmpnlepd + vcmpnleps + vcmpnlesd + vcmpnless + vcmpnle_uqpd + vcmpnle_uqps + vcmpnle_uqsd + vcmpnle_uqss + vcmpnle_uspd + vcmpnle_usps + vcmpnle_ussd + vcmpnle_usss + vcmpnltpd + vcmpnltps + vcmpnltsd + vcmpnltss + vcmpnlt_uqpd + vcmpnlt_uqps + vcmpnlt_uqsd + vcmpnlt_uqss + vcmpnlt_uspd + vcmpnlt_usps + vcmpnlt_ussd + vcmpnlt_usss + vcmpordpd + vcmpordps + vcmpordsd + vcmpordss + vcmpord_qpd + vcmpord_qps + vcmpord_qsd + vcmpord_qss + vcmpord_spd + vcmpord_sps + vcmpord_ssd + vcmpord_sss + vcmppd + vcmpps + vcmpsd + vcmpss + vcmptruepd + vcmptrueps + vcmptruesd + vcmptruess + vcmptrue_uqpd + vcmptrue_uqps + vcmptrue_uqsd + vcmptrue_uqss + vcmptrue_uspd + vcmptrue_usps + vcmptrue_ussd + vcmptrue_usss + vcmpunordpd + vcmpunordps + vcmpunordsd + vcmpunordss + vcmpunord_qpd + vcmpunord_qps + vcmpunord_qsd + vcmpunord_qss + vcmpunord_spd + vcmpunord_sps + vcmpunord_ssd + vcmpunord_sss + vcomisd + vcomiss + vcompresspd + vcompressps + vcvtdq2pd + vcvtdq2ps + vcvtne2ps2bf16 + vcvtpd2dq + vcvtpd2ps + vcvtpd2qq + vcvtpd2udq + vcvtpd2uqq + vcvtph2ps + vcvtps2dq + vcvtps2pd + vcvtps2ph + vcvtps2qq + vcvtps2udq + vcvtps2uqq + vcvtqq2pd + vcvtqq2ps + vcvtsd2si + vcvtsd2ss + vcvtsd2usi + vcvtsi2sd + vcvtsi2ss + vcvtss2sd + vcvtss2si + vcvtss2usi + vcvttpd2dq + vcvttpd2qq + vcvttpd2udq + vcvttpd2uqq + vcvttps2dq + vcvttps2qq + vcvttps2udq + vcvttps2uqq + vcvttsd2si + vcvttsd2usi + vcvttss2si + vcvttss2usi + vcvtudq2pd + vcvtudq2ps + vcvtuqq2pd + vcvtuqq2ps + vcvtusi2sd + vcvtusi2ss + vdbpsadbw + vdivpd + vdivps + vdivsd + vdivss + vdpbf16ps + vdppd + vdpps + verr + verw + vexp2pd + vexp2ps + vexpandpd + vexpandps + vextractf128 + vextractf32x4 + vextractf32x8 + vextractf64x2 + vextractf64x4 + vextracti128 + vextracti32x4 + vextracti32x8 + vextracti64x2 + vextracti64x4 + vextractps + vfixupimmpd + vfixupimmps + vfixupimmsd + vfixupimmss + vfmadd123pd + vfmadd123ps + vfmadd123sd + vfmadd123ss + vfmadd132pd + vfmadd132ps + vfmadd132sd + vfmadd132ss + vfmadd213pd + vfmadd213ps + vfmadd213sd + vfmadd213ss + vfmadd231pd + vfmadd231ps + vfmadd231sd + vfmadd231ss + vfmadd312pd + vfmadd312ps + vfmadd312sd + vfmadd312ss + vfmadd321pd + vfmadd321ps + vfmadd321sd + vfmadd321ss + vfmaddpd + vfmaddps + vfmaddsd + vfmaddss + vfmaddsub123pd + vfmaddsub123ps + vfmaddsub132pd + vfmaddsub132ps + vfmaddsub213pd + vfmaddsub213ps + vfmaddsub231pd + vfmaddsub231ps + vfmaddsub312pd + vfmaddsub312ps + vfmaddsub321pd + vfmaddsub321ps + vfmaddsubpd + vfmaddsubps + vfmsub123pd + vfmsub123ps + vfmsub123sd + vfmsub123ss + vfmsub132pd + vfmsub132ps + vfmsub132sd + vfmsub132ss + vfmsub213pd + vfmsub213ps + vfmsub213sd + vfmsub213ss + vfmsub231pd + vfmsub231ps + vfmsub231sd + vfmsub231ss + vfmsub312pd + vfmsub312ps + vfmsub312sd + vfmsub312ss + vfmsub321pd + vfmsub321ps + vfmsub321sd + vfmsub321ss + vfmsubadd123pd + vfmsubadd123ps + vfmsubadd132pd + vfmsubadd132ps + vfmsubadd213pd + vfmsubadd213ps + vfmsubadd231pd + vfmsubadd231ps + vfmsubadd312pd + vfmsubadd312ps + vfmsubadd321pd + vfmsubadd321ps + vfmsubaddpd + vfmsubaddps + vfmsubpd + vfmsubps + vfmsubsd + vfmsubss + vfnmadd123pd + vfnmadd123ps + vfnmadd123sd + vfnmadd123ss + vfnmadd132pd + vfnmadd132ps + vfnmadd132sd + vfnmadd132ss + vfnmadd213pd + vfnmadd213ps + vfnmadd213sd + vfnmadd213ss + vfnmadd231pd + vfnmadd231ps + vfnmadd231sd + vfnmadd231ss + vfnmadd312pd + vfnmadd312ps + vfnmadd312sd + vfnmadd312ss + vfnmadd321pd + vfnmadd321ps + vfnmadd321sd + vfnmadd321ss + vfnmaddpd + vfnmaddps + vfnmaddsd + vfnmaddss + vfnmsub123pd + vfnmsub123ps + vfnmsub123sd + vfnmsub123ss + vfnmsub132pd + vfnmsub132ps + vfnmsub132sd + vfnmsub132ss + vfnmsub213pd + vfnmsub213ps + vfnmsub213sd + vfnmsub213ss + vfnmsub231pd + vfnmsub231ps + vfnmsub231sd + vfnmsub231ss + vfnmsub312pd + vfnmsub312ps + vfnmsub312sd + vfnmsub312ss + vfnmsub321pd + vfnmsub321ps + vfnmsub321sd + vfnmsub321ss + vfnmsubpd + vfnmsubps + vfnmsubsd + vfnmsubss + vfpclasspd + vfpclassps + vfpclasssd + vfpclassss + vfrczpd + vfrczps + vfrczsd + vfrczss + vgatherdpd + vgatherdps + vgatherpf0dpd + vgatherpf0dps + vgatherpf0qpd + vgatherpf0qps + vgatherpf1dpd + vgatherpf1dps + vgatherpf1qpd + vgatherpf1qps + vgatherqpd + vgatherqps + vgetexppd + vgetexpps + vgetexpsd + vgetexpss + vgetmantpd + vgetmantps + vgetmantsd + vgetmantss + vgf2p8affineinvqb + vgf2p8affineqb + vgf2p8mulb + vhaddpd + vhaddps + vhsubpd + vhsubps + vinsertf128 + vinsertf32x4 + vinsertf32x8 + vinsertf64x2 + vinsertf64x4 + vinserti128 + vinserti32x4 + vinserti32x8 + vinserti64x2 + vinserti64x4 + vinsertps + vlddqu + vldmxcsr + vldqqu + vmaskmovdqu + vmaskmovpd + vmaskmovps + vmaxpd + vmaxps + vmaxsd + vmaxss + vmcall + vmclear + vmfunc + vminpd + vminps + vminsd + vminss + vmlaunch + vmload + vmmcall + vmovapd + vmovaps + vmovd + vmovddup + vmovdqa + vmovdqa32 + vmovdqa64 + vmovdqu + vmovdqu16 + vmovdqu32 + vmovdqu64 + vmovdqu8 + vmovhlps + vmovhpd + vmovhps + vmovlhps + vmovlpd + vmovlps + vmovmskpd + vmovmskps + vmovntdq + vmovntdqa + vmovntpd + vmovntps + vmovntqq + vmovq + vmovqqa + vmovqqu + vmovsd + vmovshdup + vmovsldup + vmovss + vmovupd + vmovups + vmpsadbw + vmptrld + vmptrst + vmread + vmresume + vmrun + vmsave + vmulpd + vmulps + vmulsd + vmulss + vmwrite + vmxoff + vmxon + vorpd + vorps + vp2intersectd + vpabsb + vpabsd + vpabsq + vpabsw + vpackssdw + vpacksswb + vpackusdw + vpackuswb + vpaddb + vpaddd + vpaddq + vpaddsb + vpaddsw + vpaddusb + vpaddusw + vpaddw + vpalignr + vpand + vpandd + vpandn + vpandnd + vpandnq + vpandq + vpavgb + vpavgw + vpblendd + vpblendmb + vpblendmd + vpblendmq + vpblendmw + vpblendvb + vpblendw + vpbroadcastb + vpbroadcastd + vpbroadcastmb2q + vpbroadcastmw2d + vpbroadcastq + vpbroadcastw + vpclmulhqhqdq + vpclmulhqlqdq + vpclmullqhqdq + vpclmullqlqdq + vpclmulqdq + vpcmov + vpcmpb + vpcmpd + vpcmpeqb + vpcmpeqd + vpcmpeqq + vpcmpequb + vpcmpequd + vpcmpequq + vpcmpequw + vpcmpeqw + vpcmpestri + vpcmpestrm + vpcmpgeb + vpcmpged + vpcmpgeq + vpcmpgeub + vpcmpgeud + vpcmpgeuq + vpcmpgeuw + vpcmpgew + vpcmpgtb + vpcmpgtd + vpcmpgtq + vpcmpgtub + vpcmpgtud + vpcmpgtuq + vpcmpgtuw + vpcmpgtw + vpcmpistri + vpcmpistrm + vpcmpleb + vpcmpled + vpcmpleq + vpcmpleub + vpcmpleud + vpcmpleuq + vpcmpleuw + vpcmplew + vpcmpltb + vpcmpltd + vpcmpltq + vpcmpltub + vpcmpltud + vpcmpltuq + vpcmpltuw + vpcmpltw + vpcmpneqb + vpcmpneqd + vpcmpneqq + vpcmpnequb + vpcmpnequd + vpcmpnequq + vpcmpnequw + vpcmpneqw + vpcmpngtb + vpcmpngtd + vpcmpngtq + vpcmpngtub + vpcmpngtud + vpcmpngtuq + vpcmpngtuw + vpcmpngtw + vpcmpnleb + vpcmpnled + vpcmpnleq + vpcmpnleub + vpcmpnleud + vpcmpnleuq + vpcmpnleuw + vpcmpnlew + vpcmpnltb + vpcmpnltd + vpcmpnltq + vpcmpnltub + vpcmpnltud + vpcmpnltuq + vpcmpnltuw + vpcmpnltw + vpcmpq + vpcmpub + vpcmpud + vpcmpuq + vpcmpuw + vpcmpw + vpcomb + vpcomd + vpcompressb + vpcompressd + vpcompressq + vpcompressw + vpcomq + vpcomub + vpcomud + vpcomuq + vpcomuw + vpcomw + vpconflictd + vpconflictq + vpdpbusd + vpdpbusds + vpdpwssd + vpdpwssds + vperm2f128 + vperm2i128 + vpermb + vpermd + vpermi2b + vpermi2d + vpermi2pd + vpermi2ps + vpermi2q + vpermi2w + vpermilpd + vpermilps + vpermpd + vpermps + vpermq + vpermt2b + vpermt2d + vpermt2pd + vpermt2ps + vpermt2q + vpermt2w + vpermw + vpexpandb + vpexpandd + vpexpandq + vpexpandw + vpextrb + vpextrd + vpextrq + vpextrw + vpgatherdd + vpgatherdq + vpgatherqd + vpgatherqq + vphaddbd + vphaddbq + vphaddbw + vphaddd + vphadddq + vphaddsw + vphaddubd + vphaddubq + vphaddubw + vphaddudq + vphadduwd + vphadduwq + vphaddw + vphaddwd + vphaddwq + vphminposuw + vphsubbw + vphsubd + vphsubdq + vphsubsw + vphsubw + vphsubwd + vpinsrb + vpinsrd + vpinsrq + vpinsrw + vplzcntd + vplzcntq + vpmacsdd + vpmacsdqh + vpmacsdql + vpmacssdd + vpmacssdqh + vpmacssdql + vpmacsswd + vpmacssww + vpmacswd + vpmacsww + vpmadcsswd + vpmadcswd + vpmadd52huq + vpmadd52luq + vpmaddubsw + vpmaddwd + vpmaskmovd + vpmaskmovq + vpmaxsb + vpmaxsd + vpmaxsq + vpmaxsw + vpmaxub + vpmaxud + vpmaxuq + vpmaxuw + vpminsb + vpminsd + vpminsq + vpminsw + vpminub + vpminud + vpminuq + vpminuw + vpmovb2m + vpmovd2m + vpmovdb + vpmovdw + vpmovm2b + vpmovm2d + vpmovm2q + vpmovm2w + vpmovmskb + vpmovq2m + vpmovqb + vpmovqd + vpmovqw + vpmovsdb + vpmovsdw + vpmovsqb + vpmovsqd + vpmovsqw + vpmovswb + vpmovsxbd + vpmovsxbq + vpmovsxbw + vpmovsxdq + vpmovsxwd + vpmovsxwq + vpmovusdb + vpmovusdw + vpmovusqb + vpmovusqd + vpmovusqw + vpmovuswb + vpmovw2m + vpmovwb + vpmovzxbd + vpmovzxbq + vpmovzxbw + vpmovzxdq + vpmovzxwd + vpmovzxwq + vpmuldq + vpmulhrsw + vpmulhuw + vpmulhw + vpmulld + vpmullq + vpmullw + vpmultishiftqb + vpmuludq + vpopcntb + vpopcntd + vpopcntq + vpopcntw + vpor + vpord + vporq + vpperm + vprold + vprolq + vprolvd + vprolvq + vprord + vprorq + vprorvd + vprorvq + vprotb + vprotd + vprotq + vprotw + vpsadbw + vpscatterdd + vpscatterdq + vpscatterqd + vpscatterqq + vpshab + vpshad + vpshaq + vpshaw + vpshlb + vpshld + vpshldd + vpshldq + vpshldvd + vpshldvq + vpshldvw + vpshldw + vpshlq + vpshlw + vpshrdd + vpshrdq + vpshrdvd + vpshrdvq + vpshrdvw + vpshrdw + vpshufb + vpshufbitqmb + vpshufd + vpshufhw + vpshuflw + vpsignb + vpsignd + vpsignw + vpslld + vpslldq + vpsllq + vpsllvd + vpsllvq + vpsllvw + vpsllw + vpsrad + vpsraq + vpsravd + vpsravq + vpsravw + vpsraw + vpsrld + vpsrldq + vpsrlq + vpsrlvd + vpsrlvq + vpsrlvw + vpsrlw + vpsubb + vpsubd + vpsubq + vpsubsb + vpsubsw + vpsubusb + vpsubusw + vpsubw + vpternlogd + vpternlogq + vptest + vptestmb + vptestmd + vptestmq + vptestmw + vptestnmb + vptestnmd + vptestnmq + vptestnmw + vpunpckhbw + vpunpckhdq + vpunpckhqdq + vpunpckhwd + vpunpcklbw + vpunpckldq + vpunpcklqdq + vpunpcklwd + vpxor + vpxord + vpxorq + vrangepd + vrangeps + vrangesd + vrangess + vrcp14pd + vrcp14ps + vrcp14sd + vrcp14ss + vrcp28pd + vrcp28ps + vrcp28sd + vrcp28ss + vrcpps + vrcpss + vreducepd + vreduceps + vreducesd + vreducess + vrndscalepd + vrndscaleps + vrndscalesd + vrndscaless + vroundpd + vroundps + vroundsd + vroundss + vrsqrt14pd + vrsqrt14ps + vrsqrt14sd + vrsqrt14ss + vrsqrt28pd + vrsqrt28ps + vrsqrt28sd + vrsqrt28ss + vrsqrtps + vrsqrtss + vscalefpd + vscalefps + vscalefsd + vscalefss + vscatterdpd + vscatterdps + vscatterpf0dpd + vscatterpf0dps + vscatterpf0qpd + vscatterpf0qps + vscatterpf1dpd + vscatterpf1dps + vscatterpf1qpd + vscatterpf1qps + vscatterqpd + vscatterqps + vshuff32x4 + vshuff64x2 + vshufi32x4 + vshufi64x2 + vshufpd + vshufps + vsqrtpd + vsqrtps + vsqrtsd + vsqrtss + vstmxcsr + vsubpd + vsubps + vsubsd + vsubss + vtestpd + vtestps + vucomisd + vucomiss + vunpckhpd + vunpckhps + vunpcklpd + vunpcklps + vxorpd + vxorps + vzeroall + vzeroupper + wbinvd + wbnoinvd + wrfsbase + wrgsbase + wrmsr + wrpkru + wrshr + wrssd + wrssq + wrussd + wrussq + xabort + xadd + xbegin + xbts + xchg + xcryptcbc + xcryptcfb + xcryptctr + xcryptecb + xcryptofb + xend + xgetbv + xlat + xlatb + xor + xorpd + xorps + xresldtrk + xrstor + xrstor64 + xrstors + xrstors64 + xsave + xsave64 + xsavec + xsavec64 + xsaveopt + xsaveopt64 + xsaves + xsaves64 + xsetbv + xsha1 + xsha256 + xstore + xsusldtrk + xtest + + + + call + iret + iretd + iretq + iretw + ja + jae + jb + jbe + jc + jcxz + je + jecxz + jg + jge + jl + jle + jmp + jmpe + jna + jnae + jnb + jnbe + jnc + jne + jng + jnge + jnl + jnle + jno + jnp + jns + jnz + jo + jp + jpe + jpo + jrcxz + js + jz + ret + retd + retf + retfd + retfq + retfw + retn + retnd + retnq + retnw + retq + retw + + + + arg + assign + clear + defalias + define + defstr + deftok + depend + elif + elifctx + elifdef + elifempty + elifenv + elifidn + elifidni + elifn + elifnctx + elifndef + elifnempty + elifnenv + elifnidn + elifnidni + elifntoken + eliftoken + else + exitrep + endif + endmacro + endrep + error + fatal + idefine + if + ifctx + ifdef + ifempty + ifid + ifidn + ifidni + ifmacro + ifn + ifnctx + ifndef + ifnempty + ifnenv + ifnidn + ifnidni + ifnmacro + ifntoken + ifnum + ifstr + iftoken + imacro + include + line + local + macro + pathsearch + pop + pragma + push + rep + repl + rotate + stacksize + strcat + strlen + substr + undef + unmacro + use + warning + xdefine + + + + + times + + equ + + db + dw + dd + dq + dt + do + dy + dz + + resb + resw + resd + resq + rest + reso + resy + resz + + incbin + + byte + word + dword + qword + tword + oword + yword + zword + short + ptr + + + + + abs + a32 + as + bnd + cs + lock + nobnd + rel + rep + repe + repne + repnz + repz + xacquire + xrelease + + + absolute + bits + common + default + cpu + extern + global + org + section + seg + segment + static + strict + use16 + use32 + wrt + + + struc + endstruc + istruc + at + iend + align + alignb + + __?BITS?__ + __?SECT?__ + __?NASM_MAJOR?__ + __?NASM_MINOR?__ + __?NASM_SUBMINOR?__ + __?NASM_PATCHLEVEL?__ + __?NASM_SNAPSHOT?__ + __?NASM_VERSION_ID?__ + __?NASM_VER?__ + __?FILE?__ + __?LINE?__ + __?OUTPUT_FORMAT?__ + __?DEBUG_FORMAT?__ + __?DATE?__ + __?TIME?__ + __?DATE_NUM?__ + __?TIME_NUM?__ + __?UTC_DATE?__ + __?UTC_TIME?__ + __?UTC_DATE_NUM?__ + __?UTC_TIME_NUM?__ + __?POSIX_TIME?__ + __?PASS?__ + __?USE_ALTREG?__ + __?ALIGNMODE?__ + + __?utf16?__ + __?utf16le?__ + __?utf16be?__ + __?utf32?__ + __?utf32le?__ + __?utf32be?__ + __?float8?__ + __?float16?__ + __?bfloat16?__ + __?float32?__ + __?float64?__ + __?float80m?__ + __?float80e?__ + __?float128l?__ + __?float128h?__ + __?Infinity?__ + __?QNaN?__ + __?NaN?__ + __?SNaN?__ + __?FLOAT_DAZ?__ + __?FLOAT_ROUND?__ + __?FLOAT?__ + __?FLOAT?__ + + + + got + gotoff + gotpc + gotpcrel + gottpoff + imagebase + plt + start + sym + tlsie + tlvp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/nim.xml b/syntax/nim.xml new file mode 100644 --- /dev/null +++ b/syntax/nim.xml @@ -0,0 +1,356 @@ + + + + + + + + + + const + export + import + include + lambda + let + var + + + + assert + asm + atomic + block + break + case + cast + compiles + continue + declared + declaredinscope + defined + discard + do + echo + elif + else + end + except + finally + for + from + if + mixin + bind + new + raise + return + sizeof + try + when + while + quit + using + yield + + + + addr + and + as + div + in + is + isnot + mod + not + notin + of + or + shl + shr + xor + + + + array + bool + byte + cchar + cdouble + char + cfloat + cint + clong + cshort + cstring + cuint + distinct + expr + float + float32 + float64 + generic + int + int8 + int16 + int32 + int64 + interface + openarray + pointer + set + seq + stmt + string + tuple + typedesc + uint + uint8 + uint16 + uint32 + uint64 + varargs + void + untyped + typed + + + + out + ptr + ref + shared + static + + + + false + inf + nil + true + on + off + + + + result + + + + converter + iterator + macro + method + proc + func + template + + + + type + concept + object + enum + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/noweb.xml b/syntax/noweb.xml --- a/syntax/noweb.xml +++ b/syntax/noweb.xml @@ -1,6 +1,6 @@ - + diff --git a/syntax/objectivecpp.xml b/syntax/objectivecpp.xml --- a/syntax/objectivecpp.xml +++ b/syntax/objectivecpp.xml @@ -1,6 +1,6 @@ - + break @@ -164,8 +164,6 @@ - - @@ -179,20 +177,31 @@ - - + + - - - + + + + + + + + + + + + + + @@ -212,16 +221,15 @@ + + - - - - - + + @@ -236,9 +244,7 @@ - - - + @@ -250,9 +256,7 @@ - - - + @@ -262,9 +266,7 @@ - - - + @@ -293,8 +295,9 @@ - + + diff --git a/syntax/ocaml.xml b/syntax/ocaml.xml --- a/syntax/ocaml.xml +++ b/syntax/ocaml.xml @@ -17,7 +17,7 @@ extensions="*.ml;*.mli" mimetype="text/x-ocaml" section="Sources" - version="6" + version="7" priority="10" kateversion="2.4" author="Glyn Webster (glynwebster@orcon.net.nz) and Vincent Hugot (vincent.hugot@gmail.com)" @@ -431,6 +431,10 @@ + + + + diff --git a/syntax/octave.xml b/syntax/octave.xml --- a/syntax/octave.xml +++ b/syntax/octave.xml @@ -20,8 +20,8 @@ Thanks to Luis Silvestre for previous version and suggestions --> - - + + @@ -2765,7 +2765,8 @@ - + + @@ -2801,6 +2802,13 @@ + + + + + + + @@ -2823,8 +2831,7 @@ - - + diff --git a/syntax/opencl.xml b/syntax/opencl.xml --- a/syntax/opencl.xml +++ b/syntax/opencl.xml @@ -1,7 +1,7 @@ - + - - @@ -140,12 +138,23 @@ - - - + + + + + + + + + + + + + + @@ -172,12 +181,16 @@ + + + + @@ -193,27 +206,19 @@ - - - + - - - - - - - + @@ -224,9 +229,7 @@ - - - + @@ -253,8 +256,9 @@ - + + diff --git a/syntax/pascal.xml b/syntax/pascal.xml --- a/syntax/pascal.xml +++ b/syntax/pascal.xml @@ -2,7 +2,7 @@ File Text - - FIXME - TODO - NOTE - ### - @@ -185,15 +179,21 @@ - + + + - + + + - + + + @@ -206,14 +206,14 @@ - - - + + + diff --git a/syntax/perl.xml b/syntax/perl.xml --- a/syntax/perl.xml +++ b/syntax/perl.xml @@ -39,7 +39,7 @@ Enhance tr/// and y/// support. --> - + if @@ -465,7 +465,7 @@ - + @@ -508,7 +508,7 @@ - + @@ -534,7 +534,7 @@ - + @@ -552,8 +552,12 @@ + + + + - + @@ -570,7 +574,7 @@ - + @@ -592,7 +596,7 @@ - + @@ -625,7 +629,7 @@ - + @@ -658,7 +662,7 @@ - + @@ -674,7 +678,7 @@ - + @@ -694,8 +698,8 @@ + - @@ -838,30 +842,33 @@ - + + + + - + - + - + diff --git a/syntax/php.xml b/syntax/php.xml --- a/syntax/php.xml +++ b/syntax/php.xml @@ -73,7 +73,7 @@ ]> - + + + + + + @@ -10923,10 +10928,12 @@ + + @@ -11046,8 +11053,9 @@ - + + diff --git a/syntax/pike.xml b/syntax/pike.xml --- a/syntax/pike.xml +++ b/syntax/pike.xml @@ -1,7 +1,7 @@ - + break @@ -66,24 +66,28 @@ - + + + + - + + - + - + @@ -105,16 +109,14 @@ - - - + diff --git a/syntax/postscript.xml b/syntax/postscript.xml --- a/syntax/postscript.xml +++ b/syntax/postscript.xml @@ -1,6 +1,6 @@ - + abs @@ -405,10 +405,14 @@ - + - + + + + + @@ -432,3 +436,4 @@ + diff --git a/syntax/povray.xml b/syntax/povray.xml --- a/syntax/povray.xml +++ b/syntax/povray.xml @@ -5,7 +5,7 @@ - + aa_threshold @@ -923,45 +923,50 @@ + + - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + + diff --git a/syntax/powershell.xml b/syntax/powershell.xml --- a/syntax/powershell.xml +++ b/syntax/powershell.xml @@ -1,7 +1,7 @@ - @@ -889,8 +888,8 @@ - - + + @@ -907,9 +906,16 @@ - + + + + + + + + @@ -938,3 +944,4 @@ + diff --git a/syntax/prolog.xml b/syntax/prolog.xml --- a/syntax/prolog.xml +++ b/syntax/prolog.xml @@ -105,7 +105,7 @@ ]> + @@ -786,6 +787,7 @@ + @@ -1029,3 +1031,4 @@ your home directory. You have to open a new instance of kwrite/kate to use the new syntax file. --> + diff --git a/syntax/protobuf.xml b/syntax/protobuf.xml --- a/syntax/protobuf.xml +++ b/syntax/protobuf.xml @@ -1,6 +1,6 @@ - + message @@ -82,12 +82,16 @@ + + + + @@ -113,8 +117,9 @@ - + + diff --git a/syntax/pure.xml b/syntax/pure.xml --- a/syntax/pure.xml +++ b/syntax/pure.xml @@ -32,69 +32,69 @@ Boston, MA 02111-1307, USA. --> - + - case - when - with + case + when + with - end + end - const - def - else - extern - if - infix - infixl - infixr - interface - let - namespace - nonfix - of - otherwise - outfix - postfix - prefix - private - public - then - type - using + const + def + else + extern + if + infix + infixl + infixr + interface + let + namespace + nonfix + of + otherwise + outfix + postfix + prefix + private + public + then + type + using - catch - throw - __break__ - __trace__ + catch + throw + __break__ + __trace__ - bigint - bool - char - float - double - expr - short - int - long - string - pointer - void - int8 - int16 - int32 - int64 - matrix - dmatrix - cmatrix - imatrix - smatrix - nmatrix + bigint + bool + char + float + double + expr + short + int + long + string + pointer + void + int8 + int16 + int32 + int64 + matrix + dmatrix + cmatrix + imatrix + smatrix + nmatrix @@ -108,7 +108,7 @@ - + @@ -118,12 +118,17 @@ - - + + + - + + + + + @@ -140,7 +145,8 @@ - + + diff --git a/syntax/purebasic.xml b/syntax/purebasic.xml --- a/syntax/purebasic.xml +++ b/syntax/purebasic.xml @@ -1,5 +1,5 @@ - + Break @@ -1738,6 +1738,7 @@ + @@ -1760,7 +1761,7 @@ - + diff --git a/syntax/python.xml b/syntax/python.xml --- a/syntax/python.xml +++ b/syntax/python.xml @@ -19,7 +19,7 @@ - + import @@ -447,6 +447,7 @@ + diff --git a/syntax/qml.xml b/syntax/qml.xml --- a/syntax/qml.xml +++ b/syntax/qml.xml @@ -4,7 +4,7 @@ ]> - @@ -130,7 +130,6 @@ - @@ -141,9 +140,7 @@ - - @@ -168,10 +165,10 @@ - + - - + + @@ -180,7 +177,7 @@ - + diff --git a/syntax/r.xml b/syntax/r.xml --- a/syntax/r.xml +++ b/syntax/r.xml @@ -8,7 +8,7 @@ R : http://www.r-project.org/ RKWard : http://rkward.kde.org/ --> - + @@ -56,7 +56,7 @@ - + @@ -79,22 +79,32 @@ - - - + + - + + + + + + + + + + + + @@ -105,48 +115,56 @@ - - - - + + + + - - + + + + + + + + + + + - - + - - - - - + + + + - + - - - - - - - - + + + + + + + + - + + diff --git a/syntax/relaxng.xml b/syntax/relaxng.xml --- a/syntax/relaxng.xml +++ b/syntax/relaxng.xml @@ -16,7 +16,7 @@ - Namespace rules --> - + @@ -112,8 +113,9 @@ - + + diff --git a/syntax/relaxngcompact.xml b/syntax/relaxngcompact.xml --- a/syntax/relaxngcompact.xml +++ b/syntax/relaxngcompact.xml @@ -1,6 +1,6 @@ - + default @@ -81,6 +81,9 @@ + + + @@ -104,5 +107,8 @@ + + + diff --git a/syntax/rest.xml b/syntax/rest.xml --- a/syntax/rest.xml +++ b/syntax/rest.xml @@ -14,7 +14,7 @@ Copyright 2010 Matt Williams (matt@milliams.com) Copyright 2014 Matthew Woehlke (mw_triad@users.sourceforge.net) --> - + @@ -70,6 +70,7 @@ + @@ -117,3 +118,4 @@ + diff --git a/syntax/rhtml.xml b/syntax/rhtml.xml --- a/syntax/rhtml.xml +++ b/syntax/rhtml.xml @@ -2,7 +2,7 @@ - + ]> - + @@ -315,12 +315,6 @@ word_wrap - - TODO - FIXME - NOTE - - @@ -332,22 +326,22 @@ - - + + - - - - - + + + + + - - - + + + @@ -371,15 +365,16 @@ - + + + - @@ -414,21 +409,21 @@ - + - + - + @@ -437,28 +432,28 @@ - + - + - + - + @@ -467,14 +462,14 @@ - + - + - + @@ -483,9 +478,9 @@ - + - + @@ -496,7 +491,7 @@ - + @@ -504,7 +499,7 @@ - + @@ -512,14 +507,14 @@ - + - + @@ -533,26 +528,36 @@ + + + + + + + + + + + + - - - + - + - + - + - + @@ -562,16 +567,16 @@ - + - + - + @@ -584,18 +589,18 @@ - + - + - - - - - + + + + + @@ -650,9 +655,11 @@ + + - + @@ -711,10 +718,10 @@ - - - - + + + + @@ -727,13 +734,18 @@ + + + - - + + - + + + @@ -885,7 +897,7 @@ --> - + @@ -950,7 +962,7 @@ --> - + @@ -1014,7 +1026,7 @@ --> - + @@ -1078,7 +1090,7 @@ --> - + @@ -1144,7 +1156,7 @@ --> - + @@ -1165,73 +1177,74 @@ - + + - - - - - + + + + + - - - - - - + + + + + + - + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - + - - + + - - - - - - - - + + + + + + + + - + + diff --git a/syntax/roff.xml b/syntax/roff.xml --- a/syntax/roff.xml +++ b/syntax/roff.xml @@ -7,7 +7,7 @@ ]> - + @@ -79,7 +79,9 @@ + + @@ -195,3 +197,4 @@ + diff --git a/syntax/ruby.xml b/syntax/ruby.xml --- a/syntax/ruby.xml +++ b/syntax/ruby.xml @@ -31,7 +31,7 @@ + @@ -431,7 +432,9 @@ + + @@ -891,24 +894,24 @@ - + - - - - - + + + + + - - - + + + - - - + + + @@ -916,15 +919,15 @@ - + - - + + - + diff --git a/syntax/rust.xml b/syntax/rust.xml --- a/syntax/rust.xml +++ b/syntax/rust.xml @@ -28,12 +28,12 @@ --> - - - + + + + ]> - + fn @@ -372,11 +372,11 @@ - + - + - + @@ -386,13 +386,13 @@ - + - + @@ -429,14 +429,14 @@ - - + + - + - + @@ -451,6 +451,7 @@ + diff --git a/syntax/scala.xml b/syntax/scala.xml --- a/syntax/scala.xml +++ b/syntax/scala.xml @@ -1,6 +1,6 @@ - - - + + @@ -3469,9 +3469,16 @@ --> - + + + + + + + + @@ -3498,8 +3505,9 @@ - + + diff --git a/syntax/scheme.xml b/syntax/scheme.xml --- a/syntax/scheme.xml +++ b/syntax/scheme.xml @@ -1,394 +1,1393 @@ - - - - - <= - < - = - => - >= - > - - - / - *,* - *) - + - - - #\nul - #\soh - #\stx - #\etx - #\eot - #\enq - #\ack - #\bel - #\bs - #\ht - #\nl - #\vt - #\np - #\cr - #\so - #\si - #\dle - #\dc1 - #\dc2 - #\dc3 - #\dc4 - #\nak - #\syn - #\etb - #\can - #\em - #\sub - #\esc - #\fs - #\gs - #\rs - #\us - #\space - #\sp - #\newline - #\nl - #\tab - #\ht - #\backspace - #\bs - #\return - #\cr - #\page - #\np - #\null - #\nul - - - define - define* - define-accessor - define-class - defined? - define-generic - define-macro - define-method - define-module - define-private - define-public - define*-public - define-reader-ctor - define-syntax - define-syntax-macro - defmacro - defmacro* - defmacro*-public - - - abs - acos - and - angle - append - applymap - asin - assoc - assq - assv - atan - begin - boolean? - break - caaaar - caaadr - caaar - caadar - caaddr - caadr - caar - cadaar - cadadr - cadar - caddar - cadddr - caddr - cadr - call/cc - call-with-current-continuation - call-with-input-file - call-with-output-file - call-with-values - car - case - catch - cdaaar - cdaadr - cdaar - cdadar - cdaddr - cdadr - cdar - cddaar - cddadr - cddar - cdddar - cddddr - cdddr - cddr - cdr - ceiling - char-alphabetic? - char-ci>=? - char-ci>? - char-ci=? - char-ci<=? - char-downcase - char->integer - char>=? - char>? - char=? - char? - char-lower-case? - char<?c - char<=? - char-numeric? - char-ready? - char-upcase - char-upper-case? - char-whitespace? - close-input-port - close-output-port - complex? - cond - cons - continue - cos - current-input-port - current-output-port - denominator - display - do - dynamic-wind - else - eof-object? - eq? - equal? - eqv? - eval - even? - exact->inexact - exact? - exp - expt - floor - force - for-each - gcd - har-ci<? - if - imag-part - inexact->exact - inexact? - input-port? - integer->char - integer? - interaction-environment - lambda - lcm - length - let - let* - letrec - letrec-syntax - let-syntax - list->string - list - list? - list-ref - list-tail - load - log - magnitude - make-polar - make-rectangular - make-string - make-vector - max - member - memq - memv - min - modulo - negative? - newline - not - null-environment - null? - number? - number->string - numerator - odd? - open-input-file - open-output-file - or - output-port? - pair? - peek-char - port? - positive? - procedure? - quotient - rational? - rationalize - read-char - read - real? - real-part - remainder - reverse - round - scheme-report-environment - set-car! - set-cdr! - sin - sqrt - string-append - string-ci>=? - string-ci>? - string-ci=? - string-ci<=? - string-ci<? - string-copy - string-fill! - string>=? - string>? - string->list - string->number - string->symbol - string=? - string - string? - string-length - string<=? - string<? - string-ref - string-set! - substring - symbol->string - symbol? - syntax-rules - tan - transcript-off - transcript-on - truncate - values - vector-fill! - vector->listlist->vector - vector - vector? - vector-length - vector-ref - vector-set! - while - with-input-from-file - with-output-to-file - write-char - write - zero? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +]++|"[^"]*+")*+"> + + + + + + + + + +]> + + + + + <= + < + = + => + >= + > + - + / + *,* + + + ! + $ + % + * + / + = + > + ? + ^ + _ + ~ + . + ... + + + alarm + backspace + delete + esc + linefeed + newline + page + return + space + tab + vtab + + nul + soh + stx + etx + eot + enq + ack + bel + bs + ht + nl + vt + np + cr + so + si + dle + dc1 + dc2 + dc3 + dc4 + nak + syn + etb + can + em + sub + fs + gs + rs + us + sp + nl + ht + bs + cr + np + null + nul + + + define + define* + define-accessor + define-class + defined? + define-generic + define-macro + define-method + define-module + define-private + define-public + define*-public + define-reader-ctor + define-syntax + define-syntax-macro + defmacro + defmacro* + defmacro*-public + + + &assertion + &condition + &error + &i/o-decoding + &i/o-encoding + &i/o-file-already-exists + &i/o-file-does-not-exist + &i/o-file-is-read-only + &i/o-file-protection + &i/o-filename + &i/o-invalid-position + &i/o-port + &i/o-read + &i/o-write + &i/o + &implementation-restriction + &implementation-violation + &irritants + &lexical + &message + &mistake + &no-infinities + &no-nans + &non-continuable + &serious + &syntax + &undefined + &violation + &warning + &who + &xcond + abs + acos + and + angle + append + applymap + asin + assert + assertion-violation + assertion-violation? + assoc + assp + assq + assv + atan + begin + binary-port? + bitwise-and + bitwise-arithmetic-shift-left + bitwise-arithmetic-shift-right + bitwise-arithmetic-shift + bitwise-bit-count + bitwise-bit-field + bitwise-bit-set? + bitwise-copy-bit-field + bitwise-copy-bit + bitwise-first-bit-set + bitwise-if + bitwise-ior + bitwise-length + bitwise-not + bitwise-reverse-bit-field + bitwise-rotate-bit-field + bitwise-xor + boolean=? + boolean? + bound-identifier=? + break + buffer-mode + buffer-mode? + bytevector->sint-list + bytevector->string + bytevector->u8-list + bytevector->uint-list + bytevector-copy! + bytevector-copy + bytevector-fill! + bytevector-ieee-double-native-ref + bytevector-ieee-double-native-set! + bytevector-ieee-double-ref + bytevector-ieee-double-set! + bytevector-ieee-single-native-ref + bytevector-ieee-single-native-set! + bytevector-ieee-single-ref + bytevector-ieee-single-set! + bytevector-length + bytevector-s16-native-ref + bytevector-s16-native-set! + bytevector-s16-ref + bytevector-s16-set! + bytevector-s32-native-ref + bytevector-s32-native-set! + bytevector-s32-ref + bytevector-s32-set! + bytevector-s64-native-ref + bytevector-s64-native-set! + bytevector-s64-ref + bytevector-s64-set! + bytevector-s8-ref + bytevector-s8-set! + bytevector-sint-ref + bytevector-sint-set! + bytevector-u16-native-ref + bytevector-u16-native-set! + bytevector-u16-ref + bytevector-u16-set! + bytevector-u32-native-ref + bytevector-u32-native-set! + bytevector-u32-ref + bytevector-u32-set! + bytevector-u64-native-ref + bytevector-u64-native-set! + bytevector-u64-ref + bytevector-u64-set! + bytevector-u8-ref + bytevector-u8-set! + bytevector-uint-ref + bytevector-uint-set! + bytevector=? + bytevector? + caaaar + caaadr + caaar + caadar + caaddr + caadr + caar + cadaar + cadadr + cadar + caddar + cadddr + caddr + cadr + call-with-bytevector-output-port + call-with-current-continuation + call-with-input-file + call-with-output-file + call-with-port + call-with-string-output-port + call-with-values + call/cc + car + case-lambda + case + catch + cdaaar + cdaadr + cdaar + cdadar + cdaddr + cdadr + cdar + cddaar + cddadr + cddar + cdddar + cddddr + cdddr + cddr + cdr + ceiling + char>=? + char>? + char<=? + char<? + char<?c + char->integer + char-alphabetic? + char-ci>=? + char-ci>? + char-ci<=? + char-ci<? + char-ci=? + char-downcase + char-foldcase + char-general-category + char-lower-case? + char-numeric? + char-ready? + char-title-case? + char-titlecase + char-upcase + char-upper-case? + char-whitespace? + char=? + char? + close-input-port + close-output-port + close-port + complex? + cond + condition-accessor + condition-irritants + condition-message + condition-predicate + condition-who + condition + condition? + cons* + cons + continue + cos + current-error-port + current-input-port + current-output-port + datum->syntax + define-condition-type + define-enumeration + define-record-type + delete-file + denominator + display + div-and-mod + div0-and-mod0 + div0 + div + do + dynamic-wind + else + endianness + enum-set->list + enum-set-complement + enum-set-constructor + enum-set-difference + enum-set-indexer + enum-set-intersection + enum-set-member? + enum-set-projection + enum-set-subset? + enum-set-union + enum-set-universe + enum-set=? + eof-object + eof-object? + eol-style + eq? + equal-hash + equal? + eqv? + error-handling-mode + error + error? + eval + even? + exact->inexact + exact->inexact + exact-integer-sqrt + exact + exact? + exp + expt + file-exists? + file-options + filter + find + finite? + fixnum->flonum + fixnum-width + fixnum? + fl>=? + fl>? + fl<=? + fl<? + fl* + fl+ + fl- + fl/ + fl=? + flabs + flacos + flasin + flatan + flceiling + flcos + fldenominator + fldiv-and-mod + fldiv0-and-mod0 + fldiv0 + fldiv + fleven? + flexp + flexpt + flfinite? + flfloor + flinfinite? + flinteger? + fllog + flmax + flmin + flmod0 + flmod + flnan? + flnegative? + flnumerator + flodd? + flonum? + floor + flpositive? + flround + flsin + flsqrt + fltan + fltruncate + flush-output-port + flzero? + for-each + force + free-identifier=? + fx>=? + fx>? + fx<=? + fx<? + fx*/carry + fx* + fx+/carry + fx+ + fx-/carry + fx- + fx=? + fxand + fxarithmetic-shift-left + fxarithmetic-shift-right + fxarithmetic-shift + fxbit-count + fxbit-field + fxbit-set? + fxcopy-bit-field + fxcopy-bit + fxdiv-and-mod + fxdiv0-and-mod0 + fxdiv0 + fxdiv + fxeven? + fxfirst-bit-set + fxif + fxior + fxlength + fxmax + fxmin + fxmod0 + fxmod + fxnegative? + fxnot + fxodd? + fxpositive? + fxreverse-bit-field + fxrotate-bit-field + fxxor + fxzero? + gcd + generate-temporaries + get-bytevector-all + get-bytevector-n! + get-bytevector-n + get-bytevector-some + get-char + get-datum + get-line + get-string-all + get-string-n! + get-string-n + get-u8 + greatest-fixnum + guard + har-ci<? + hashtable-clear! + hashtable-contains? + hashtable-copy + hashtable-delete! + hashtable-entries + hashtable-equivalence-function + hashtable-hash-function + hashtable-keys + hashtable-mutable? + hashtable-ref + hashtable-set! + hashtable-size + hashtable-update! + hashtable? + i/o-decoding-error? + i/o-encoding-error-char + i/o-encoding-error? + i/o-error-filename + i/o-error-port + i/o-error-position + i/o-error? + i/o-file-already-exists-error? + i/o-file-does-not-exist-error? + i/o-file-is-read-only-error? + i/o-file-protection-error? + i/o-filename-error? + i/o-invalid-position-error? + i/o-port-error? + i/o-read-error? + i/o-write-error? + identifier-syntax + identifier? + if + imag-part + implementation-restriction-violation? + inexact->exact + inexact + inexact? + infinite? + input-port? + integer->char + integer-valued? + integer? + interaction-environment + irritants-condition? + lambda + latin-1-codec + lcm + least-fixnum + length + let*-values + let* + let-syntax + let-values + let + letrec* + letrec-syntax + letrec + lexical-violation? + list->string + list->vector + list-ref + list-sort + list-tail + list + list? + load + log + lookahead-char + lookahead-u8 + magnitude + make-assertion-violation + make-bytevector + make-custom-binary-input-port + make-custom-binary-input/output-port + make-custom-binary-output-port + make-custom-textual-input-port + make-custom-textual-input/output-port + make-custom-textual-output-port + make-enumeration + make-eq-hashtable + make-eqv-hashtable + make-error + make-hashtable + make-i/o-decoding-error + make-i/o-encoding-error + make-i/o-error + make-i/o-file-already-exists-error + make-i/o-file-does-not-exist-error + make-i/o-file-is-read-only-error + make-i/o-file-protection-error + make-i/o-filename-error + make-i/o-invalid-position-error + make-i/o-port-error + make-i/o-read-error + make-i/o-write-error + make-implementation-restriction-violation + make-irritants-condition + make-lexical-violation + make-message-condition + make-no-infinities-violation + make-no-nans-violation + make-non-continuable-violation + make-polar + make-record-constructor-descriptor + make-record-type-descriptor + make-rectangular + make-serious-condition + make-string + make-syntax-violation + make-transcoder + make-undefined-violation + make-variable-transformer + make-vector + make-violation + make-warning + make-who-condition + max + member + memp + memq + memv + message-condition? + min + mod0 + mod + modulo + nan? + native-endianness + native-eol-style + native-transcoder + negative? + newline + no-infinities-violation? + no-nans-violation? + non-continuable-violation? + not + null-environment + null? + number->string + number->string + number? + numerator + odd? + open-bytevector-input-port + open-bytevector-output-port + open-file-input-port + open-file-input/output-port + open-file-output-port + open-input-file + open-output-file + open-string-input-port + open-string-output-port + or + output-port-buffer-mode + output-port? + pair? + partition + peek-char + port-eof? + port-has-port-position? + port-has-set-port-position!? + port-position + port-transcoder + port? + positive? + procedure? + put-bytevector + put-char + put-datum + put-string + put-u8 + quasiquote + quasisyntax + quote + quotient + raise-continuable + raise + rational-valued? + rational? + rationalize + read-char + read + real->flonum + real-part + real-valued? + real? + record-accessor + record-constructor-descriptor + record-constructor + record-field-mutable? + record-mutator + record-predicate + record-rtd + record-type-descriptor + record-type-descriptor? + record-type-field-names + record-type-generative? + record-type-name + record-type-opaque? + record-type-parent + record-type-sealed? + record-type-uid + record? + remainder + remove + remp + remq + remv + reverse + round + scheme-report-environment + serious-condition? + set! + set-car! + set-cdr! + set-port-position! + simple-conditions + sin + sint-list->bytevector + sqrt + standard-error-port + standard-input-port + standard-output-port + string>=? + string>? + string<=? + string<? + string->bytevector + string->list + string->number + string->symbol + string->utf16 + string->utf32 + string->utf8 + string-append + string-ci>=? + string-ci>? + string-ci<=? + string-ci<? + string-ci-hash + string-ci=? + string-copy + string-downcase + string-fill! + string-foldcase + string-hash + string-length + string-normalize-nfc + string-normalize-nfd + string-normalize-nfkc + string-normalize-nfkd + string-ref + string-set! + string-titlecase + string-upcase + string + string=? + string? + substring + symbol->string + symbol-hash + symbol=? + symbol? + syntax->datum + syntax-case + syntax-rules + syntax-violation-form + syntax-violation-subform + syntax-violation + syntax-violation? + syntax + tan + textual-port? + transcoded-port + transcoder-codec + transcoder-eol-style + transcoder-error-handling-mode + transcript-off + transcript-on + truncate + u8-list->bytevector + uint-list->bytevector + undefined-violation? + unquote-splicing + unquote + unsyntax-splicing + unsyntax + utf-16-codec + utf-8-codec + utf16->string + utf32->string + utf8->string + values + vector->list + vector->listlist->vector + vector-fill! + vector-length + vector-ref + vector-set! + vector-sort! + vector-sort + vector + vector? + violation? + warning? + while + who-condition? + with-exception-handler + with-input-from-file + with-output-to-file + with-syntax + write-char + write + zero? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/sci.xml b/syntax/sci.xml --- a/syntax/sci.xml +++ b/syntax/sci.xml @@ -1,6 +1,6 @@ - + do @@ -1164,9 +1164,14 @@ - + + + + + + @@ -1184,7 +1189,7 @@ - + diff --git a/syntax/sed.xml b/syntax/sed.xml --- a/syntax/sed.xml +++ b/syntax/sed.xml @@ -1,6 +1,6 @@ - + @@ -220,7 +220,11 @@ - + + + + + @@ -265,3 +269,4 @@ + diff --git a/syntax/sgml.xml b/syntax/sgml.xml --- a/syntax/sgml.xml +++ b/syntax/sgml.xml @@ -1,10 +1,10 @@ - + - + @@ -25,7 +25,10 @@ - + + + + @@ -39,7 +42,7 @@ - + diff --git a/syntax/sml.xml b/syntax/sml.xml --- a/syntax/sml.xml +++ b/syntax/sml.xml @@ -1,6 +1,6 @@ - + abstype @@ -65,7 +65,7 @@ - + @@ -77,7 +77,10 @@ - + + + + @@ -98,7 +101,8 @@ - + + diff --git a/syntax/sql-mysql.xml b/syntax/sql-mysql.xml --- a/syntax/sql-mysql.xml +++ b/syntax/sql-mysql.xml @@ -6,7 +6,7 @@ modifications by Milian Wolff (mail@milianw.de) v3 fix comments by Gene Thomas --> - + BEGIN @@ -381,7 +381,7 @@ - + @@ -443,10 +443,17 @@ - + + + + + + + + @@ -472,10 +479,11 @@ - - + + + diff --git a/syntax/sql-postgresql.xml b/syntax/sql-postgresql.xml --- a/syntax/sql-postgresql.xml +++ b/syntax/sql-postgresql.xml @@ -3,7 +3,7 @@ - + BEGIN @@ -991,7 +991,7 @@ - + @@ -1007,10 +1007,10 @@ - + - + @@ -1020,7 +1020,7 @@ - + @@ -1036,10 +1036,17 @@ - + + + + + + + + @@ -1066,9 +1073,10 @@ - - + + + diff --git a/syntax/sql.xml b/syntax/sql.xml --- a/syntax/sql.xml +++ b/syntax/sql.xml @@ -5,7 +5,7 @@ v3 fix comments by Gene Thomas --> - + BEGIN @@ -877,7 +877,7 @@ - + @@ -915,11 +915,20 @@ - + + + + + + + + - + + + @@ -947,8 +956,8 @@ - - + + diff --git a/syntax/stata.xml b/syntax/stata.xml --- a/syntax/stata.xml +++ b/syntax/stata.xml @@ -1,6 +1,6 @@ - @@ -3175,12 +3175,16 @@ + + + + @@ -3214,10 +3218,11 @@ - - + + + diff --git a/syntax/tcl.xml b/syntax/tcl.xml --- a/syntax/tcl.xml +++ b/syntax/tcl.xml @@ -28,7 +28,7 @@ - Fixed detection of varaibles with names containing serval namespace delimiters (::) --> - + after @@ -532,7 +532,11 @@ - + + + + + @@ -563,3 +567,4 @@ + diff --git a/syntax/tcsh.xml b/syntax/tcsh.xml --- a/syntax/tcsh.xml +++ b/syntax/tcsh.xml @@ -8,7 +8,7 @@ ]> - + @@ -655,7 +657,7 @@ - + @@ -815,3 +817,4 @@ + diff --git a/syntax/texinfo.xml b/syntax/texinfo.xml --- a/syntax/texinfo.xml +++ b/syntax/texinfo.xml @@ -1,6 +1,6 @@ - + - + @@ -26,12 +26,16 @@ - - + + + + + - + + @@ -55,9 +59,10 @@ - - + + + diff --git a/syntax/toml.xml b/syntax/toml.xml new file mode 100644 --- /dev/null +++ b/syntax/toml.xml @@ -0,0 +1,137 @@ + + + + + + + + + +]> + + + + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/syntax/typescript.xml b/syntax/typescript.xml --- a/syntax/typescript.xml +++ b/syntax/typescript.xml @@ -1,14 +1,18 @@ - - - - - + + + + + + + + + + ]> keywords##JavaScript - declare reserved##JavaScript type arguments + declare readonly abstract constructor @@ -106,7 +114,8 @@ keyof infer - + awaited + @@ -221,6 +230,18 @@ + + + + + + + + + @@ -235,13 +256,8 @@ - - - - + + @@ -260,6 +276,7 @@ + @@ -269,15 +286,27 @@ + + - + - - + + + + + + @@ -285,35 +314,44 @@ + - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -358,13 +396,13 @@ - + - + @@ -396,11 +434,11 @@ - + - + @@ -429,8 +467,8 @@ This rule fixes it provisionally. --> - - + + @@ -491,7 +529,10 @@ - + + + + @@ -528,10 +569,13 @@ + + + diff --git a/syntax/verilog.xml b/syntax/verilog.xml --- a/syntax/verilog.xml +++ b/syntax/verilog.xml @@ -1,6 +1,6 @@ - + macromodule @@ -187,21 +187,27 @@ + + - + + + - + - + + + @@ -244,9 +250,10 @@ - + + diff --git a/syntax/vhdl.xml b/syntax/vhdl.xml --- a/syntax/vhdl.xml +++ b/syntax/vhdl.xml @@ -8,7 +8,7 @@ ]> - + file @@ -218,16 +218,16 @@ - - - - @@ -269,7 +269,7 @@ - + @@ -283,7 +283,7 @@ - @@ -296,11 +296,11 @@ - - @@ -333,7 +333,7 @@ - @@ -345,11 +345,11 @@ - - - @@ -384,7 +384,7 @@ - @@ -400,7 +400,7 @@ String="&bos;if&eos;"/> - @@ -491,7 +491,7 @@ - @@ -532,7 +532,7 @@ - @@ -543,11 +543,11 @@ - - @@ -599,7 +599,9 @@ + + @@ -635,22 +637,23 @@ - + - - - - + + + + - + + diff --git a/syntax/xml.xml b/syntax/xml.xml --- a/syntax/xml.xml +++ b/syntax/xml.xml @@ -4,9 +4,9 @@ - + ]> - + @@ -40,8 +40,9 @@ - + + @@ -63,7 +64,7 @@ - + @@ -88,8 +89,7 @@ - - + @@ -143,7 +143,8 @@ - + + diff --git a/syntax/xorg.xml b/syntax/xorg.xml --- a/syntax/xorg.xml +++ b/syntax/xorg.xml @@ -1,6 +1,6 @@ - + @@ -36,6 +36,7 @@ + @@ -63,3 +64,4 @@ + diff --git a/syntax/xslt.xml b/syntax/xslt.xml --- a/syntax/xslt.xml +++ b/syntax/xslt.xml @@ -1,9 +1,9 @@ - - + + + ]> - + xsl:value-of @@ -362,7 +362,8 @@ - + + @@ -406,35 +407,35 @@ - - + + - - - - - - - - - - + + + + + + + + + - - - + + + - - - - + + + + - + + diff --git a/syntax/xul.xml b/syntax/xul.xml --- a/syntax/xul.xml +++ b/syntax/xul.xml @@ -4,7 +4,7 @@ ]> - + @@ -426,6 +426,7 @@ + @@ -519,8 +520,8 @@ - - + + @@ -544,8 +545,9 @@ + + - @@ -562,7 +564,7 @@ - + @@ -615,10 +617,9 @@ - - - + + diff --git a/syntax/yacc.xml b/syntax/yacc.xml --- a/syntax/yacc.xml +++ b/syntax/yacc.xml @@ -12,12 +12,12 @@ == UPDATE HISTORY == 2018-02-20 // Nibaldo González - Fix '$' symbol, highlighted as 'dsError' by C++ (isocpp.xml). + Fix '$' symbol, highlighted as 'dsError' by C++ (isocpp.xml). Update syntax for Bison (3.0.4): - Add declarations, directives in rules and the '@' variable. - - Allow a tag in '%union', declarations in multiple lines and + - Allow a tag in '%union', declarations in multiple lines and grammar declarations in the grammar rules section. - - The ';' char is not necessary to finish a rule. Allow '; |' + - The ';' char is not necessary to finish a rule. Allow '; |' within rules. Add mimetypes and extensions '*.ypp' & '*.y++'. @@ -32,7 +32,7 @@ ======================================================================== --> - + @@ -62,7 +62,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -141,9 +141,9 @@ - + - @@ -164,7 +164,7 @@ - + @@ -195,15 +195,17 @@ - + - + + + @@ -229,7 +231,7 @@ - + @@ -259,7 +261,7 @@ - + diff --git a/syntax/yaml.xml b/syntax/yaml.xml --- a/syntax/yaml.xml +++ b/syntax/yaml.xml @@ -1,20 +1,20 @@ - + + - - - - + + + + - + - - - - + + + + @@ -37,7 +37,7 @@ - @@ -47,7 +47,7 @@ - + @@ -62,10 +62,10 @@ - - - - + + + + @@ -75,7 +75,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -134,16 +134,16 @@ - + - + - + @@ -151,7 +151,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -210,21 +210,21 @@ - + - + - - - - + + + + @@ -239,18 +239,18 @@ - + - + - - - - + + + + @@ -290,12 +290,12 @@ - + - + @@ -314,7 +314,7 @@ - + @@ -322,6 +322,7 @@ + @@ -347,10 +348,10 @@ - - - - + + + + @@ -365,7 +366,7 @@ + String="^&space;*\t+\s*(?=(?:(?:&keyDQ;|&keySQ;|[^#])*[^#\w\|<>"'])?&literalOp;&endValue;)" /> + String="^&space;*(?:\?&space;*|\-&space;+){1,6}(?:(?:&keyDQ;|&keySQ;|[^#\-\?\s]|\-[^\s#])(?:(?:&keyDQ;|&keySQ;|[^#])*[^#\w\|<>"'])?)?&literalOp;&endValue;" /> + String="^&space;*(?:(?:[&\*]|!!)\S+\s+)+&literalOp;&endValue;" /> @@ -515,7 +516,7 @@ - + @@ -523,7 +524,7 @@ - + @@ -633,3 +634,4 @@ + diff --git a/syntax/zsh.xml b/syntax/zsh.xml --- a/syntax/zsh.xml +++ b/syntax/zsh.xml @@ -8,7 +8,7 @@ ]> - + @@ -534,7 +534,9 @@ + + @@ -600,7 +602,8 @@ - + + @@ -957,3 +960,4 @@ + diff --git a/test/Cheapskate_QCA.hs b/test/Cheapskate_QCA.hs deleted file mode 100644 --- a/test/Cheapskate_QCA.hs +++ /dev/null @@ -1,47 +0,0 @@ -module Cheapskate_QCA where - -import Cheapskate.Types -import qualified Data.Sequence as Seq () -import Network.Mattermost.QuickCheck (genText, genSeq) -import Test.Tasty.QuickCheck - -genBlocks :: Gen Blocks -genBlocks = genSeq genBlock - -genBlock :: Gen Block -genBlock = oneof [ Para <$> genInlines - , Header <$> arbitrary <*> genInlines - , Blockquote <$> genBlocks - , List <$> arbitrary <*> genListType <*> listOf (genBlocks) - , CodeBlock <$> genCodeAttr <*> genText - , HtmlBlock <$> genText - , return HRule - ] - -genInlines :: Gen Inlines -genInlines = genSeq genInline - -genInline :: Gen Inline -genInline = oneof [ Str <$> genText - , return Space - , return SoftBreak - , return LineBreak - , Emph <$> genInlines - , Strong <$> genInlines - , Code <$> genText - , Link <$> genInlines <*> genText <*> genText - , Image <$> genInlines <*> genText <*> genText - , Entity <$> genText - , RawHtml <$> genText - ] - -genListType :: Gen ListType -genListType = oneof [ Bullet <$> arbitrary - , Numbered <$> genNumWrapper <*> arbitrary - ] - -genNumWrapper :: Gen NumWrapper -genNumWrapper = elements [ PeriodFollowing, ParenFollowing ] - -genCodeAttr :: Gen CodeAttr -genCodeAttr = CodeAttr <$> genText <*> genText diff --git a/test/Message_QCA.hs b/test/Message_QCA.hs --- a/test/Message_QCA.hs +++ b/test/Message_QCA.hs @@ -3,7 +3,7 @@ module Message_QCA where -import Cheapskate_QCA +import RichText_QCA import Control.Monad (replicateM) import Data.Map hiding (foldr) import Data.Maybe (fromMaybe) @@ -16,7 +16,6 @@ import Matterhorn.Types.Messages import Matterhorn.Types.Posts -import Matterhorn.Types.RichText genMap :: Ord key => Gen key -> Gen value -> Gen (Map key value) genMap gk gv = let kv = (,) <$> gk <*> gv in fromList <$> listOf kv @@ -32,7 +31,7 @@ genMessage :: Gen Message genMessage = Message - <$> (fromMarkdownBlocks Nothing <$> genBlocks) + <$> genBlocks <*> genText <*> genUserRef <*> genTime @@ -60,7 +59,7 @@ genMessage__DeletedPost :: Gen Message__DeletedPost genMessage__DeletedPost = Message__DeletedPost <$> (Message - <$> (fromMarkdownBlocks Nothing <$> genBlocks) + <$> genBlocks <*> genText <*> genUserRef <*> genTime @@ -82,7 +81,7 @@ genMessage__Posted :: Gen Message__Posted genMessage__Posted = Message__Posted <$> (Message - <$> (fromMarkdownBlocks Nothing <$> genBlocks) + <$> genBlocks <*> genText <*> genUserRef <*> genTime diff --git a/test/RichText_QCA.hs b/test/RichText_QCA.hs new file mode 100644 --- /dev/null +++ b/test/RichText_QCA.hs @@ -0,0 +1,70 @@ +module RichText_QCA + ( genBlocks + ) +where + +import qualified Data.Sequence as Seq +import Network.Mattermost.Types ( PostId(..), Id(..) ) +import Network.Mattermost.QuickCheck (genText, genSeq) +import Test.Tasty.QuickCheck +import Matterhorn.Types.RichText + +genBlocks :: Gen Blocks +genBlocks = Blocks <$> genSeq genBlock + +seqOf :: Gen a -> Gen (Seq.Seq a) +seqOf g = fmap Seq.fromList (listOf g) + +genBlock :: Gen Block +genBlock = oneof [ Para <$> genInlines + , Header <$> arbitrary <*> genInlines + , Blockquote <$> genBlocks + , List <$> genListType <*> genListSpacing <*> seqOf genBlocks + , CodeBlock <$> genCodeBlockInfo <*> genText + , HTMLBlock <$> genText + , return HRule + ] + +genCodeBlockInfo :: Gen CodeBlockInfo +genCodeBlockInfo = CodeBlockInfo <$> genMaybe genText <*> genMaybe genText + +genMaybe :: Gen a -> Gen (Maybe a) +genMaybe g = + oneof [ Just <$> g + , return Nothing + ] + +genInlines :: Gen Inlines +genInlines = Inlines <$> genSeq genInline + +genInline :: Gen Inline +genInline = oneof [ EText <$> genText + , return ESpace + , return ESoftBreak + , return ELineBreak + , EEmph <$> genInlines + , EStrong <$> genInlines + , ECode <$> genInlines + , EStrikethrough <$> genInlines + , EHyperlink <$> (URL <$> genText) <*> genInlines + , EPermalink <$> (TeamURLName <$> genText) <*> genPostId <*> (genMaybe genInlines) + , EImage <$> (URL <$> genText) <*> genInlines + , ERawHtml <$> genText + ] + +genPostId :: Gen PostId +genPostId = PI <$> Id <$> genText + +genListType :: Gen ListType +genListType = oneof [ BulletList <$> arbitrary + , OrderedList <$> arbitrary <*> genEnumTy <*> genDelimTy + ] + +genListSpacing :: Gen ListSpacing +genListSpacing = elements [ TightList, LooseList ] + +genEnumTy :: Gen EnumeratorType +genEnumTy = elements [ Decimal, UpperAlpha, LowerAlpha, UpperRoman, LowerRoman ] + +genDelimTy :: Gen DelimiterType +genDelimTy = elements [ Period, OneParen, TwoParens ] diff --git a/test/test_messages.hs b/test/test_messages.hs --- a/test/test_messages.hs +++ b/test/test_messages.hs @@ -70,7 +70,7 @@ tick (ServerTime (UTCTime d t)) = ServerTime $ UTCTime d $ succ t makeMsg :: ServerTime -> Maybe MessageId -> Message -makeMsg t mId = Message Seq.empty mempty NoUser t (CP NormalPost) False False Seq.empty NotAReply +makeMsg t mId = Message mempty mempty NoUser t (CP NormalPost) False False Seq.empty NotAReply mId Map.empty Nothing False False Nothing makeMsgs :: [Message] -> Messages