Skip to content

Merge dev15.8 to dev16.0 #5248

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

Merged
KevinRansom merged 5 commits into from
Jun 30, 2018
Merged

Merge dev15.8 to dev16.0 #5248

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc8b91c
Clean up IntelliSense perf UI and flow options for IntelliSense (#5211)
cartermp Jun 20, 2018
4f5e2c0
fix ParseAndCheckDocument (#5175)
vasily-kirichenko Jun 20, 2018
1225c3e
Address merge issues
Jun 21, 2018
37213bb
Merge pull request #5222 from KevinRansom/cherrypick5211
KevinRansom Jun 21, 2018
4ca11df
Merge branch 'dev16.0' into merges/dev15.8-to-dev16.0
KevinRansom Jun 28, 2018
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
Prev Previous commit
Next Next commit
Address merge issues
  • Loading branch information
Kevin Ransom committed Jun 21, 2018
commit 1225c3e7cc4d8e73b39462c7d07e2d8c671ba2f4
37 changes: 18 additions & 19 deletions vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerExtensions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,17 @@ type FSharpChecker with
checker.ParseDocument(document, parsingOptions, sourceText=sourceText.ToString(), userOpName=userOpName)

member checker.ParseAndCheckDocument(filePath: string, textVersionHash: int, sourceText: string, options: FSharpProjectOptions, allowStaleResults: bool, userOpName: string) =
let parseAndCheckFile =
async {
let! parseResults, checkFileAnswer = checker.ParseAndCheckFileInProject(filePath, textVersionHash, sourceText, options, userOpName=userOpName)
return
match checkFileAnswer with
| FSharpCheckFileAnswer.Aborted ->
None
| FSharpCheckFileAnswer.Succeeded(checkFileResults) ->
Some (parseResults, checkFileResults)
}
async {
let parseAndCheckFile =
async {
let! parseResults, checkFileAnswer = checker.ParseAndCheckFileInProject(filePath, textVersionHash, sourceText, options, userOpName=userOpName)
return
match checkFileAnswer with
| FSharpCheckFileAnswer.Aborted ->
None
| FSharpCheckFileAnswer.Succeeded(checkFileResults) ->
Some (parseResults, checkFileResults)
}

let tryGetFreshResultsWithTimeout() =
async {
Expand All @@ -40,16 +41,15 @@ type FSharpChecker with
return None // worker is cancelled at this point, we cannot return it and wait its completion anymore
}

let bindParsedInput(results: (FSharpParseFileResults * FSharpCheckFileResults) option) =
match results with
| Some(parseResults, checkResults) ->
match parseResults.ParseTree with
| Some parsedInput -> Some (parseResults, parsedInput, checkResults)
let bindParsedInput(results: (FSharpParseFileResults * FSharpCheckFileResults) option) =
match results with
| Some(parseResults, checkResults) ->
match parseResults.ParseTree with
| Some parsedInput -> Some (parseResults, parsedInput, checkResults)
| None -> None
| None -> None
| None -> None

if allowStaleResults then
async {
if allowStaleResults then
let! freshResults = tryGetFreshResultsWithTimeout()

let! results =
Expand All @@ -69,7 +69,6 @@ type FSharpChecker with
return bindParsedInput results
}


member checker.ParseAndCheckDocument(document: Document, options: FSharpProjectOptions, allowStaleResults: bool, userOpName: string, ?sourceText: SourceText) =
async {
let! cancellationToken = Async.CancellationToken
Expand Down