Skip to content

Commit

Permalink
Change to ExternalAutocomplete functions (ionide#1178)
Browse files Browse the repository at this point in the history
Co-authored-by: Chet Husk <[email protected]>
  • Loading branch information
2 people authored and nojaf committed Nov 3, 2023
1 parent f7467c5 commit 00037fa
Show file tree
Hide file tree
Showing 10 changed files with 347 additions and 156 deletions.
6 changes: 5 additions & 1 deletion src/FsAutoComplete.Core/KeywordList.fs
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,16 @@ module KeywordList =
let hashSymbolCompletionItems =
hashDirectives
|> Seq.map (fun kv ->
let label = "#" + kv.Key

{ CompletionItem.Create(kv.Key) with
Data = Some(Newtonsoft.Json.Linq.JValue(label))
Kind = Some CompletionItemKind.Keyword
InsertText = Some kv.Key
FilterText = Some kv.Key
SortText = Some kv.Key
Documentation = Some(Documentation.String kv.Value)
Label = "#" + kv.Key })
Label = label })
|> Seq.toArray

let allKeywords: string list =
Expand All @@ -58,6 +61,7 @@ module KeywordList =
allKeywords
|> List.mapi (fun id k ->
{ CompletionItem.Create(k) with
Data = Some(Newtonsoft.Json.Linq.JValue(k))
Kind = Some CompletionItemKind.Keyword
InsertText = Some k
SortText = Some(sprintf "1000000%d" id)
Expand Down
5 changes: 5 additions & 0 deletions src/FsAutoComplete/LspHelpers.fs
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,7 @@ type FSharpConfigDto =
ExcludeProjectDirectories: string[] option
KeywordsAutocomplete: bool option
ExternalAutocomplete: bool option
FullNameExternalAutocomplete: bool option
Linter: bool option
LinterConfig: string option
IndentationSize: int option
Expand Down Expand Up @@ -771,6 +772,7 @@ type FSharpConfig =
ExcludeProjectDirectories: string[]
KeywordsAutocomplete: bool
ExternalAutocomplete: bool
FullNameExternalAutocomplete: bool
Linter: bool
LinterConfig: string option
IndentationSize: int
Expand Down Expand Up @@ -816,6 +818,7 @@ type FSharpConfig =
ExcludeProjectDirectories = [||]
KeywordsAutocomplete = false
ExternalAutocomplete = false
FullNameExternalAutocomplete = false
IndentationSize = 4
Linter = false
LinterConfig = None
Expand Down Expand Up @@ -861,6 +864,7 @@ type FSharpConfig =
ExcludeProjectDirectories = defaultArg dto.ExcludeProjectDirectories [||]
KeywordsAutocomplete = defaultArg dto.KeywordsAutocomplete false
ExternalAutocomplete = defaultArg dto.ExternalAutocomplete false
FullNameExternalAutocomplete = defaultArg dto.ExternalAutocomplete false
IndentationSize = defaultArg dto.IndentationSize 4
Linter = defaultArg dto.Linter false
LinterConfig = dto.LinterConfig
Expand Down Expand Up @@ -958,6 +962,7 @@ type FSharpConfig =
ExcludeProjectDirectories = defaultArg dto.ExcludeProjectDirectories x.ExcludeProjectDirectories
KeywordsAutocomplete = defaultArg dto.KeywordsAutocomplete x.KeywordsAutocomplete
ExternalAutocomplete = defaultArg dto.ExternalAutocomplete x.ExternalAutocomplete
FullNameExternalAutocomplete = defaultArg dto.FullNameExternalAutocomplete x.FullNameExternalAutocomplete
IndentationSize = defaultArg dto.IndentationSize x.IndentationSize
Linter = defaultArg dto.Linter x.Linter
LinterConfig = dto.LinterConfig
Expand Down
2 changes: 2 additions & 0 deletions src/FsAutoComplete/LspHelpers.fsi
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ type FSharpConfigDto =
ExcludeProjectDirectories: string[] option
KeywordsAutocomplete: bool option
ExternalAutocomplete: bool option
FullNameExternalAutocomplete: bool option
Linter: bool option
LinterConfig: string option
IndentationSize: int option
Expand Down Expand Up @@ -363,6 +364,7 @@ type FSharpConfig =
ExcludeProjectDirectories: string[]
KeywordsAutocomplete: bool
ExternalAutocomplete: bool
FullNameExternalAutocomplete: bool
Linter: bool
LinterConfig: string option
IndentationSize: int
Expand Down
68 changes: 37 additions & 31 deletions src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2575,6 +2575,33 @@ type AdaptiveFSharpLspServer
getCompletions forceGetOpenFileTypeCheckResults
| _ -> getCompletions forceGetOpenFileTypeCheckResultsStale

let getCodeToInsert (d: DeclarationListItem) =
match d.NamespaceToOpen with
| Some no when config.FullNameExternalAutocomplete -> sprintf "%s.%s" no d.NameInCode
| _ -> d.NameInCode

let createCompletionItem (config: FSharpConfig) (id: int) (d: DeclarationListItem) =
let code = getCodeToInsert d

/// The `label` for completion "System.Math.Ceiling" will be displayed as "Ceiling (System.Math)". This is to bias the viewer towards the member name,
/// with the namespace being less-important. The `filterText` is the text that will be used to filter the list of completions as the user types.
/// Prepending the member name to the filter text makes it so that the text the user is mot likely typing catches more relevant members at the head of the list.
/// e.f. "CeilingSystem.Math.Ceiling" means that the user typing `ceiling` will catch all of the members named ceiling that are in the available namespaces
let label, filterText =
match d.NamespaceToOpen with
| Some no when config.FullNameExternalAutocomplete ->
sprintf "%s (%s)" d.NameInList no, d.NameInList + code
| Some no -> sprintf "%s (open %s)" d.NameInList no, d.NameInList
| None -> d.NameInList, d.NameInList

{ CompletionItem.Create(d.NameInList) with
Data = Some(JValue(d.FullName))
Kind = (AVal.force glyphToCompletionKind) d.Glyph
InsertText = Some code
SortText = Some(sprintf "%06d" id)
FilterText = Some filterText
Label = label }

match!
retryAsyncOption
(TimeSpan.FromMilliseconds(15.))
Expand All @@ -2592,37 +2619,14 @@ type AdaptiveFSharpLspServer
transact (fun () ->
HashMap.OfList(
[ for d in decls do
d.NameInList, (d, pos, filePath, volatileFile.Source.GetLine, typeCheckResults.GetAST) ]
d.FullName, (d, pos, filePath, volatileFile.Source.GetLine, typeCheckResults.GetAST) ]
)
|> autoCompleteItems.UpdateTo)
|> ignore<bool>

let includeKeywords = config.KeywordsAutocomplete && shouldKeywords

let items =
decls
|> Array.mapi (fun id d ->
let code =
if
System.Text.RegularExpressions.Regex.IsMatch(d.NameInList, """^[a-zA-Z][a-zA-Z0-9']+$""")
then
d.NameInList
elif d.NamespaceToOpen.IsSome then
d.NameInList
else
FSharpKeywords.NormalizeIdentifierBackticks d.NameInList

let label =
match d.NamespaceToOpen with
| Some no -> sprintf "%s (open %s)" d.NameInList no
| None -> d.NameInList

{ CompletionItem.Create(d.NameInList) with
Kind = (AVal.force glyphToCompletionKind) d.Glyph
InsertText = Some code
SortText = Some(sprintf "%06d" id)
FilterText = Some d.NameInList
Label = label })
let items = decls |> Array.mapi (createCompletionItem config)

let its =
if not includeKeywords then
Expand Down Expand Up @@ -2650,6 +2654,8 @@ type AdaptiveFSharpLspServer
}

override __.CompletionItemResolve(ci: CompletionItem) =
let config = AVal.force config

let mapHelpText (ci: CompletionItem) (text: HelpText) =
match text with
| HelpText.Simple(symbolName, text) ->
Expand Down Expand Up @@ -2708,8 +2714,8 @@ type AdaptiveFSharpLspServer

let n =
match getAutoCompleteNamespacesByDeclName sym |> AVal.force with
| None -> None
| Some s -> Some s
| Some s when not config.FullNameExternalAutocomplete -> Some s
| _ -> None

CoreResponse.Res(HelpText.Full(sym, tip, n))

Expand All @@ -2725,10 +2731,10 @@ type AdaptiveFSharpLspServer
)

return!
match ci.InsertText with
| None -> LspResult.internalError "No InsertText"
| Some insertText ->
helpText insertText
match ci.Data with
| None -> LspResult.internalError "No FullName"
| Some fullName ->
helpText (fullName.ToString())
|> Result.ofCoreResponse
|> Result.bimap
(function
Expand Down
Loading

0 comments on commit 00037fa

Please sign in to comment.