NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit1225c3e

Kevin Ransom

committed

Address merge issues

1 parent4f5e2c0 commit1225c3eCopy full SHA for 1225c3e

File tree

1 file changed

+18

-19

lines changed

vsintegration/src/FSharp.Editor/LanguageService
- FSharpCheckerExtensions.fs

1 file changed

+18

-19

lines changed

`‎vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerExtensions.fs‎`

Lines changed: 18 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,16 +20,17 @@ type FSharpChecker with`
`20`	`20`	`checker.ParseDocument(document, parsingOptions, sourceText=sourceText.ToString(), userOpName=userOpName)`
`21`	`21`
`22`	`22`	`memberchecker.ParseAndCheckDocument(filePath:string,textVersionHash:int,sourceText:string,options:FSharpProjectOptions,allowStaleResults:bool,userOpName:string)=`
`23`		`-letparseAndCheckFile=`
`24`		`-async{`
`25`		`-let!parseResults,checkFileAnswer= checker.ParseAndCheckFileInProject(filePath, textVersionHash, sourceText, options, userOpName=userOpName)`
`26`		`-return`
`27`		`-match checkFileAnswerwith`
`28`		`-\| FSharpCheckFileAnswer.Aborted->`
`29`		`- None`
`30`		`-\| FSharpCheckFileAnswer.Succeeded(checkFileResults)->`
`31`		`- Some(parseResults, checkFileResults)`
`32`		`-}`
	`23`	`+async{`
	`24`	`+letparseAndCheckFile=`
	`25`	`+async{`
	`26`	`+let!parseResults,checkFileAnswer= checker.ParseAndCheckFileInProject(filePath, textVersionHash, sourceText, options, userOpName=userOpName)`
	`27`	`+return`
	`28`	`+match checkFileAnswerwith`
	`29`	`+\| FSharpCheckFileAnswer.Aborted->`
	`30`	`+ None`
	`31`	`+\| FSharpCheckFileAnswer.Succeeded(checkFileResults)->`
	`32`	`+ Some(parseResults, checkFileResults)`
	`33`	`+}`
`33`	`34`
`34`	`35`	`lettryGetFreshResultsWithTimeout()=`
`35`	`36`	`async{`
`@@ -40,16 +41,15 @@ type FSharpChecker with`
`40`	`41`	`return None// worker is cancelled at this point, we cannot return it and wait its completion anymore`
`41`	`42`	`}`
`42`	`43`
`43`		`-letbindParsedInput(results:(FSharpParseFileResults* FSharpCheckFileResults)option)=`
`44`		`-match resultswith`
`45`		`-\| Some(parseResults, checkResults)->`
`46`		`-match parseResults.ParseTreewith`
`47`		`-\| Some parsedInput-> Some(parseResults, parsedInput, checkResults)`
	`44`	`+letbindParsedInput(results:(FSharpParseFileResults* FSharpCheckFileResults)option)=`
	`45`	`+match resultswith`
	`46`	`+\| Some(parseResults, checkResults)->`
	`47`	`+match parseResults.ParseTreewith`
	`48`	`+\| Some parsedInput-> Some(parseResults, parsedInput, checkResults)`
	`49`	`+\| None-> None`
`48`	`50`	`\| None-> None`
`49`		`-\| None-> None`
`50`	`51`
`51`		`-if allowStaleResultsthen`
`52`		`-async{`
	`52`	`+if allowStaleResultsthen`
`53`	`53`	`let!freshResults= tryGetFreshResultsWithTimeout()`
`54`	`54`
`55`	`55`	`let!results=`
`@@ -69,7 +69,6 @@ type FSharpChecker with`
`69`	`69`	`return bindParsedInput results`
`70`	`70`	`}`
`71`	`71`
`72`		`-`
`73`	`72`	`memberchecker.ParseAndCheckDocument(document:Document,options:FSharpProjectOptions,allowStaleResults:bool,userOpName:string,?sourceText:SourceText)=`
`74`	`73`	`async{`
`75`	`74`	`let!cancellationToken= Async.CancellationToken`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1225c3e

File tree

1 file changed

1 file changed

`‎vsintegration/src/FSharp.Editor/LanguageService/FSharpCheckerExtensions.fs‎`

0 commit comments