Commit245a638

authored

Cherrypick uithread from Dev15.8 (dotnet#5364)

1 parenteb32ee8 commit245a638Copy full SHA for 245a638

File tree

+16

-13

lines changed

+16

-13

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@`
`21`	`21`	`usingVsShell=Microsoft.VisualStudio.Shell.VsShellUtilities;`
`22`	`22`	`usingSystem.Diagnostics.CodeAnalysis;`
`23`	`23`
`24`		`-namespaceMicrosoft.VisualStudio.FSharp.LanguageService{`
	`24`	`+namespaceMicrosoft.VisualStudio.FSharp.LanguageService`
	`25`	`+{`
`25`	`26`	`internalstaticclassUIThread{`
`26`	`27`	`staticSynchronizationContextctxt;`
`27`	`28`	`staticboolisUnitTestingMode=false;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -685,8 +685,8 @@ internal BackgroundRequest_DEPRECATED CreateBackgroundRequest(FSharpSourceBase_D`
`685`	`685`	`// Implemented in FSharpLanguageService.fs`
`686`	`686`	`internalabstractBackgroundRequest_DEPRECATEDCreateBackgroundRequest(intline,intcol,TokenInfoinfo,stringsourceText,ITextSnapshotsnapshot,MethodTipMiscellany_DEPRECATEDmethodTipMiscellany,stringfname,BackgroundRequestReasonreason,IVsTextViewview,AuthoringSinksink,ISourcesource,inttimestamp,boolsynchronous);`
`687`	`687`
`688`		`-// Implemented in FSharpLanguageService.fs`
`689`		`-internalabstractvoidOnParseFileOrCheckFileComplete(BackgroundRequest_DEPRECATEDreq);`
	`688`	`+// Implemented in FSharpLanguageService.fs`
	`689`	`+internalabstractvoidOnParseFileOrCheckFileComplete(BackgroundRequest_DEPRECATEDreq);`
`690`	`690`
`691`	`691`	`internalvoidEnsureBackgroundThreadStarted()`
`692`	`692`	`{`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -250,22 +250,22 @@ private void AddToErrorList(`
`250`	`250`	`span.iEndLine=endLine<startLine?span.iStartLine:endLine;`
`251`	`251`	`span.iEndIndex=(endColumn<startColumn)&&(span.iStartLine==span.iEndLine)?span.iStartIndex:endColumn;`
`252`	`252`
`253`		`-if(OutputWindowPane!=null`
`254`		`-&&(this.Verbosity!=LoggerVerbosity.Quiet\|\|errorEventisBuildErrorEventArgs))`
`255`		`-{`
`256`		`-// Format error and output it to the output window`
`257`		`-stringmessage=this.FormatMessage(errorEvent.Message);`
	`253`	`+if(OutputWindowPane!=null`
	`254`	`+&&(this.Verbosity!=LoggerVerbosity.Quiet\|\|errorEventisBuildErrorEventArgs))`
	`255`	`+{`
	`256`	`+// Format error and output it to the output window`
	`257`	`+stringmessage=this.FormatMessage(errorEvent.Message);`
`258`	`258`	`DefaultCompilerErrore=newDefaultCompilerError(file,`
`259`	`259`	`span.iStartLine,`
`260`	`260`	`span.iStartIndex,`
`261`	`261`	`span.iEndLine,`
`262`	`262`	`span.iEndIndex,`
`263`	`263`	`errorCode,`
`264`		`-message);`
`265`		`-e.IsWarning=isWarning;`
	`264`	`+message);`
	`265`	`+e.IsWarning=isWarning;`
`266`	`266`
`267`		`-Output(GetFormattedErrorMessage(e));`
`268`		`-}`
	`267`	`+Output(GetFormattedErrorMessage(e));`
	`268`	`+}`
`269`	`269`
`270`	`270`	`UIThread.Run(delegate()`
`271`	`271`	`{`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,8 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem`
`200`	`200`	`resourceValue`
`201`	`201`
`202`	`202`	`overridethis.Initialize()=`
`203`		`- UIThread.CaptureSynchronizationContext()`
	`203`	`+ Microsoft.VisualStudio.FSharp.LanguageService.UIThread.CaptureSynchronizationContext()`
	`204`	`+ Microsoft.VisualStudio.FSharp.ProjectSystem.UIThread.CaptureSynchronizationContext()`
`204`	`205`
`205`	`206`	`base.Initialize()`
`206`	`207`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ module Asserts =`
`51`	`51`
`52`	`52`	`moduleUIStuff=`
`53`	`53`	`letSetupSynchronizationContext()=`
	`54`	`+ Microsoft.VisualStudio.FSharp.ProjectSystem.UIThread.InitUnitTestingMode()`
`54`	`55`	`Microsoft.VisualStudio.FSharp.LanguageService.UIThread.InitUnitTestingMode()`
`55`	`56`	`Microsoft.VisualStudio.FSharp.ProjectSystem.UIThread.InitUnitTestingMode()`
`56`	`57`

Comments

(0)