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

Invalid completions now shown in explorer

Browse Source
This commit is contained in:
Paul Chiusano 2015-03-02 14:41:16 -05:00
parent dd8cc18b58
commit c21d774f98
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editor/src/Unison/Editor.elm
View File

@ -124,8 +124,8 @@ keyedSearchMatches model = case model.searchResults of
Nothing -> []
Just results -> List.map (searchEntry model) (fst results.matches)
keyedSearchIllTypedMatches : Model -> List (String,Term,Element)
keyedSearchIllTypedMatches model = case model.searchResults of
keyedSearchNonmatches : Model -> List (String,Term,Element)
keyedSearchNonmatches model = case model.searchResults of
Nothing -> []
Just results -> List.map (searchEntry model) (fst results.illTypedMatches)
@ -175,6 +175,13 @@ filteredCompletions model =
in List.filter (\(k,_,_) -> String.contains (String.trim search) k) (keyedCompletions model)
|> List.map (\(_,e,l) -> (e,l))
filteredInvalidCompletions : Model -> List (Term,Element)
filteredInvalidCompletions model =
let search = Maybe.withDefault "" (Maybe.map (.input >> .string) (model.explorer))
in List.filter (\(k,_,_) -> String.contains (String.trim search) k)
(keyedSearchNonmatches model)
|> List.map (\(_,e,l) -> (e,l))
allowApplication : Model -> Bool
allowApplication model = case model.localInfo of
Nothing -> False
@ -452,8 +459,8 @@ refreshExplorer searchbox model = case model.localInfo of
Nothing -> Pt 0 0
Just region -> { x = region.topLeft.x - 6, y = region.topLeft.y + region.height + 6 }
completions : List Element
completions = List.map snd (filteredCompletions model)
invalidCompletions = List.map snd (filteredInvalidCompletions model)
viewEnv = explorerViewEnv model
path = Maybe.withDefault [] (Maybe.map .focus model.scope)
pad e = let s = Element.spacer 10 1
@ -476,10 +483,17 @@ refreshExplorer searchbox model = case model.localInfo of
, Element.spacer 1 10
, Styles.menuSeparator (Element.widthOf above0)
, Element.spacer 1 10 ]
sep = [ Element.spacer 1 10
, Styles.menuSeparator (Element.widthOf above0)
, Element.spacer 1 10 ]
below = -- only shown if no valid completions
if List.isEmpty completions
then Element.flow Element.down (sep ++ invalidCompletions)
else Element.empty
explorer' : Explorer.Model
explorer' = model.explorer |> Maybe.map (\e ->
{ e | completions <- completions, above <- above })
{ e | completions <- completions, above <- above, below <- below })
explorerLayout : Layout (Result Containment Int)
explorerLayout = Explorer.view explorerTopLeft searchbox explorer'