-
Notifications
You must be signed in to change notification settings - Fork 155
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #74 from ionide/suave
[WIP] Add Suave hosting for FSAC
- Loading branch information
Showing
33 changed files
with
1,098 additions
and
490 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,3 +28,4 @@ TestResults.xml | |
| .fake/ | ||
|
|
||
| fsautocomplete.zip | ||
| fsautocomplete.suave.zip | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| namespace FsAutoComplete | ||
|
|
||
| open System | ||
| open System.IO | ||
| open Microsoft.FSharp.Compiler | ||
| open Microsoft.FSharp.Compiler.SourceCodeServices | ||
|
|
||
| module Response = CommandResponse | ||
|
|
||
| module Commands = | ||
| let parse (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) file lines = async { | ||
| let colorizations = state.ColorizationOutput | ||
| let parse' fileName text options = | ||
| async { | ||
| let! _parseResults, checkResults = checker.ParseAndCheckFileInProject(fileName, 0, text, options) | ||
| return match checkResults with | ||
| | FSharpCheckFileAnswer.Aborted -> [Response.info serialize "Parse aborted"] | ||
| | FSharpCheckFileAnswer.Succeeded results -> | ||
| if colorizations then | ||
| [ Response.errors serialize (results.Errors) | ||
| Response.colorizations serialize (results.GetExtraColorizationsAlternate()) ] | ||
| else [ Response.errors serialize (results.Errors) ] | ||
| } | ||
| let file = Path.GetFullPath file | ||
| let text = String.concat "\n" lines | ||
|
|
||
| if Utils.isAScript file then | ||
| let checkOptions = checker.GetProjectOptionsFromScript(file, text) | ||
| let state' = state.WithFileTextAndCheckerOptions(file, lines, checkOptions) | ||
| let! res = (parse' file text checkOptions) | ||
| return res , state' | ||
| else | ||
| let state', checkOptions = state.WithFileTextGetCheckerOptions(file, lines) | ||
| let! res = (parse' file text checkOptions) | ||
| return res, state' | ||
| } | ||
|
|
||
|
|
||
|
|
||
| let project (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) file time = async { | ||
| let file = Path.GetFullPath file | ||
|
|
||
| // The FileSystemWatcher often triggers multiple times for | ||
| // each event, as editors often modify files in several steps. | ||
| // This 'debounces' the events, by only reloading a max of once | ||
| // per second. | ||
| return match state.ProjectLoadTimes.TryFind file with | ||
| | Some oldtime when time - oldtime < TimeSpan.FromSeconds(1.0) -> [],state | ||
| | _ -> | ||
|
|
||
| match checker.TryGetProjectOptions(file) with | ||
| | Result.Failure s -> [Response.error serialize s],state | ||
| | Result.Success(po, projectFiles, outFileOpt, references, frameworkOpt) -> | ||
| let res = Response.project serialize (file, projectFiles, outFileOpt, references, frameworkOpt) | ||
| let checkOptions = | ||
| projectFiles | ||
| |> List.fold (fun s f -> Map.add f po s) state.FileCheckOptions | ||
| let loadTimes = Map.add file time state.ProjectLoadTimes | ||
| let state' = { state with FileCheckOptions = checkOptions; ProjectLoadTimes = loadTimes } | ||
| [res], state' | ||
| } | ||
|
|
||
| let declarations (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) file = async { | ||
| let file = Path.GetFullPath file | ||
| return match state.TryGetFileCheckerOptionsWithSource(file) with | ||
| | Failure s -> [Response.error serialize (s)], state | ||
| | Success (checkOptions, source) -> | ||
| let decls = checker.GetDeclarations(file, source, checkOptions) | ||
| [Response.declarations serialize (decls)], state | ||
| } | ||
|
|
||
| let helptext (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) sym = async { | ||
| return match Map.tryFind sym state.HelpText with | ||
| | None -> [Response.error serialize (sprintf "No help text available for symbol '%s'" sym)], state | ||
| | Some tip -> [Response.helpText serialize (sym, tip)], state | ||
| } | ||
|
|
||
| let compilerLocation (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) = async { | ||
| return [Response.compilerLocation serialize Environment.fsc Environment.fsi Environment.msbuild], state | ||
| } | ||
|
|
||
| let colorization (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) enabled = async { | ||
| return [], { state with ColorizationOutput = enabled } | ||
| } | ||
|
|
||
| let error (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) msg = async { | ||
| return [Response.error serialize msg], state | ||
| } | ||
|
|
||
| let completion (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) (tyRes : ParseAndCheckResults ) line col lineStr timeout filter = async { | ||
| return match tyRes.TryGetCompletions line col lineStr timeout filter with | ||
| | Some (decls, residue) -> | ||
| let declName (d: FSharpDeclarationListItem) = d.Name | ||
|
|
||
| // Send the first helptext without being requested. | ||
| // This allows it to be displayed immediately in the editor. | ||
| let firstMatchOpt = | ||
| Array.sortBy declName decls | ||
| |> Array.tryFind (fun d -> (declName d).StartsWith residue) | ||
| let res = match firstMatchOpt with | ||
| | None -> [Response.completion serialize (decls)] | ||
| | Some d -> | ||
| [ Response.helpText serialize (d.Name, d.DescriptionText) | ||
| Response.completion serialize (decls) ] | ||
|
|
||
|
|
||
|
|
||
| let helptext = | ||
| Seq.fold (fun m d -> Map.add (declName d) d.DescriptionText m) Map.empty decls | ||
| res,{ state with HelpText = helptext } | ||
|
|
||
| | None -> | ||
| [Response.error serialize "Timed out while fetching completions"], state | ||
| } | ||
|
|
||
| let toolTip (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) (tyRes : ParseAndCheckResults ) line col lineStr = async { | ||
| // A failure is only info here, as this command is expected to be | ||
| // used 'on idle', and frequent errors are expected. | ||
| return match tyRes.TryGetToolTip line col lineStr with | ||
| | Result.Failure s -> [Response.info serialize (s)], state | ||
| | Result.Success tip -> [Response.toolTip serialize tip], state | ||
| } | ||
|
|
||
| let symbolUse (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) (tyRes : ParseAndCheckResults ) line col lineStr = async { | ||
| // A failure is only info here, as this command is expected to be | ||
| // used 'on idle', and frequent errors are expected. | ||
| return match tyRes.TryGetSymbolUse line col lineStr with | ||
| | Result.Failure s -> [Response.info serialize (s)], state | ||
| | Result.Success (sym,usages) -> [Response.symbolUse serialize (sym,usages)], state | ||
| } | ||
|
|
||
| let findDeclarations (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) (tyRes : ParseAndCheckResults ) line col lineStr = async { | ||
| return match tyRes.TryFindDeclaration line col lineStr with | ||
| | Result.Failure s -> [Response.error serialize (s)], state | ||
| | Result.Success range -> [Response.findDeclaration serialize range], state | ||
| } | ||
|
|
||
| let methods (serialize : obj -> string) (state : State) (checker : FSharpCompilerServiceChecker) (tyRes : ParseAndCheckResults ) line col lines = async { | ||
| return match tyRes.TryGetMethodOverrides lines line col with | ||
| | Result.Failure s -> [Response.error serialize (s)], state | ||
| | Result.Success (meth, commas) -> [Response.methods serialize (meth, commas)], state | ||
| } |
Oops, something went wrong.