unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-11-14 16:28:34 +03:00
Code Issues Projects Releases Wiki Activity

fix issue with explorer selection layer being fubar'd

Browse Source
This commit is contained in:
Paul Chiusano 2015-04-12 22:37:06 -04:00
parent 283c115508
commit 04daa79ac4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/src/Elmz/Selection1D.elm
View File

@ -31,7 +31,7 @@ model =
else Just (Moore (Nothing, Just 0) (interactive 0 vs))
_ -> Nothing
interactive ind values {event,layout} = let limitExclusive = List.length values - 1 in case event of
interactive ind values {event,layout} = let limitExclusive = List.length values in case event of
Just (Move (Movement.D1 sign)) ->
let
index' = case sign of

15
editor/src/Unison/TermExplorer.elm
View File

@ -95,7 +95,6 @@ model searchbox =
, 7
, content.string
, Just info.admissible )
sel = Selection1D.model
la cur n = (String.padLeft (n+1) '.' "", showAppBlanks env (path focus) n, Just (appBlanks n cur))
currentApps = case Term.at focus.pathFromClosedSubterm focus.closedSubterm of
Nothing -> []
@ -129,12 +128,13 @@ model searchbox =
(sel', layout'') = layout metadata' (path focus) searchbox matches sel content infoLayout
in Moore { selection = Nothing, request = Nothing, view = Layout.element layout'' } <|
search admissible { env | metadata <- metadata' } focus completions' sel' content infoLayout layout''
Navigate nav -> Moore.step sel { event = Just nav, layout = layout' } `Maybe.andThen` \sel -> Just <|
let (sel'', layout'') = layout env.metadata (path focus) searchbox
(allCompletions content.string completions)
sel content infoLayout
in Moore { selection = Nothing, request = Nothing, view = Layout.element layout'' } <|
search admissible env focus completions sel'' content infoLayout layout''
Navigate nav -> Moore.step sel { event = Just nav, layout = layout' } `Maybe.andThen`
\sel -> Just <|
let (sel'', layout'') = layout env.metadata (path focus) searchbox
(allCompletions content.string completions)
sel content infoLayout
in Moore { selection = Nothing, request = Nothing, view = Layout.element layout'' } <|
search admissible env focus completions sel'' content infoLayout layout''
Enter ->
let valids = validCompletions (.matches << Moore.extract <| completions.results)
in Maybe.withDefault (Just state0) ( (Moore.extract sel |> .index) `Maybe.andThen`
@ -239,6 +239,7 @@ layout md path searchbox keyedCompletions sel content infoLayout =
|> Styles.explorerOutline (Styles.statusColor ok)
inputBox = Layout.embed Nothing (viewField searchbox ok content (Just (Layout.widthOf resultsBox)))
sel' = Moore.feed sel { layout = resultsBox, event = Just (Selection1D.Values (List.map snd valids)) }
`Moore.feed` { layout = resultsBox, event = Nothing }
-- NB: careful to apply the highlight just to the results box, otherwise focus is stolen
-- whenever the results box updates, see https://github.com/elm-lang/core/issues/3
hl e = case Moore.extract sel' |> .region of