Skip to content

Switched from unboxed vector for length calculation for AutoPad #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
webdevred wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switched from unboxed vector for length calculation for AutoPad #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/JbeamEdit/Formatting.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import Data.Text qualified as T
import Data.Text.Encoding (encodeUtf8)
import Data.Vector (Vector)
import Data.Vector qualified as V
import Data.Vector.Unboxed qualified as UV
import JbeamEdit.Core.Node (
InternalComment (..),
Node (..),
Expand Down Expand Up @@ -51,7 +50,7 @@ import System.OsPath (OsPath)

data FormattingState = FormattingState
{ fsUsePad :: Bool
, fsColumnWidths :: UV.Vector Int
, fsColumnWidths :: Vector Int
, fsFormattedCache :: Vector (Vector Text)
, fsHeaderCache :: Maybe (Vector Text)
, fsHeaderWasExtracted :: Bool
Expand All @@ -62,7 +61,7 @@ emptyState :: FormattingState
emptyState =
FormattingState
{ fsUsePad = False
, fsColumnWidths = UV.empty
, fsColumnWidths = V.empty
, fsFormattedCache = V.empty
, fsHeaderCache = Nothing
, fsHeaderWasExtracted = False
Expand Down Expand Up @@ -137,7 +136,7 @@ addDelimiters rs index c complexChildren state acc ns@(node : rest)
padTxt baseTxt =
if fsUsePad state && not (isCommentNode node) && comma
then
let width = sum (fsColumnWidths state UV.!? index)
let width = sum (fsColumnWidths state V.!? index)
in T.justifyLeft (width + 1) ' ' baseTxt
else baseTxt

Expand All @@ -154,14 +153,14 @@ maxColumnLengthsWithCache
:: RuleSet
-> NC.NodeCursor
-> Vector Node
-> (Maybe (Vector Text), UV.Vector Int, Vector (Vector Text), Bool, Vector Int)
-> (Maybe (Vector Text), Vector Int, Vector (Vector Text), Bool, Vector Int)
maxColumnLengthsWithCache rs cursor nodes
| V.null nodes = (Nothing, UV.empty, V.empty, False, V.empty)
| V.null nodes = (Nothing, V.empty, V.empty, False, V.empty)
| otherwise =
let (headerRow, nodesToProcess, headerWasExtracted, headerOffset) = extractHeader nodes
(arrayRows, arrayIndices) = extractArrayRows nodesToProcess headerOffset
formattedColumns = transposeAndFormat rs cursor arrayRows arrayIndices
columnWidths = UV.convert $ V.map (V.maximum . V.map T.length) formattedColumns
columnWidths = V.map (V.maximum . V.map T.length) formattedColumns
in (headerRow, columnWidths, formattedColumns, headerWasExtracted, arrayIndices)
where
extractHeader ns =
Expand Down
Loading