Commitdb91d1a

authored

Merge pull requestdotnet#5071 from Microsoft/merges/master-to-dev15.8

Merge master to dev15.8

2 parents9ecbccc +b54527d commitdb91d1aCopy full SHA for db91d1a

File tree

+596

-8

lines changed

+596

-8

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,10 @@`
`45`	`45`	`<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>`
`46`	`46`	`<MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61030</MicrosoftVisualStudioShellInterop110PackageVersion>`
`47`	`47`	`<MicrosoftVisualStudioShellInterop120PackageVersion>12.0.30110</MicrosoftVisualStudioShellInterop120PackageVersion>`
`48`		`- <MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6070</MicrosoftVisualStudioTextManagerInteropPackageVersion>`
	`48`	`+ <MicrosoftVisualStudioTextManagerInteropPackageVersion>7.10.6071</MicrosoftVisualStudioTextManagerInteropPackageVersion>`
`49`	`49`	`<MicrosoftVisualStudioTextManagerInterop80PackageVersion>8.0.50727</MicrosoftVisualStudioTextManagerInterop80PackageVersion>`
`50`	`50`	`<MicrosoftVisualStudioTextManagerInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioTextManagerInterop100PackageVersion>`
	`51`	`+ <MicrosoftVisualStudioTextManagerInterop120PackageVersion>12.0.30112</MicrosoftVisualStudioTextManagerInterop120PackageVersion>`
`51`	`52`	`<MicrosoftVisualStudioTextUIPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIPackageVersion>`
`52`	`53`	`<MicrosoftVisualStudioTextUIWpfPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIWpfPackageVersion>`
`53`	`54`	`<MicrosoftVisualStudioWCFReferenceInteropPackageVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropPackageVersion>`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -999,8 +999,11 @@ module ParsedInput =`
`999`	`999`
`1000`	`1000`	`mkPos line ctx.Pos.Column`
`1001`	`1001`
`1002`		`-lettryFindNearestPointToInsertOpenDeclaration(currentLine:int)(ast:ParsedInput)(entity:Idents)(insertionPoint:OpenStatementInsertionPoint)=`
	`1002`	`+letfindNearestPointToInsertOpenDeclaration(currentLine:int)(ast:ParsedInput)(entity:Idents)(insertionPoint:OpenStatementInsertionPoint)=`
`1003`	`1003`	`match tryFindNearestPointAndModules currentLine ast insertionPointwith`
`1004`	`1004`	`\| Some(scope,_, point), modules->`
`1005`		`- Some(findBestPositionToInsertOpenDeclaration modules scope point entity)`
`1006`		`-\|_-> None`
	`1005`	`+ findBestPositionToInsertOpenDeclaration modules scope point entity`
	`1006`	`+\|_->`
	`1007`	`+// we failed to find insertion point because ast is empty for some reason, return top left point in this case`
	`1008`	`+{ ScopeKind= ScopeKind.TopModule`
	`1009`	`+ Pos= mkPos10}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ module public ParsedInput =`
`145`	`145`	`(((* requiresQualifiedAccessParent:) Idents option(* autoOpenParent:) Idents option(* entityNamespace) Idents option(* entity:) Idents)->(Entity InsertContext)[])`
`146`	`146`
`147`	`147`	/// Returns `InsertContext` based on current position and symbol idents.
`148`		`-valtryFindNearestPointToInsertOpenDeclaration:currentLine:int->ast:Ast.ParsedInput->entity:Idents->insertionPoint:OpenStatementInsertionPoint->InsertContext option`
	`148`	`+valfindNearestPointToInsertOpenDeclaration:currentLine:int->ast:Ast.ParsedInput->entity:Idents->insertionPoint:OpenStatementInsertionPoint->InsertContext`
`149`	`149`
`150`	`150`	`/// Returns lond identifier at position.`
`151`	`151`	`valgetLongIdentAt:ast:Ast.ParsedInput->pos:Range.pos->Ast.LongIdent option`

Comments

(0)