Commita8d516a

authored and

committed

fix namespace auto open if parsed input is empty (#5040)

@vasily-kirichenko Thank you for this fix.

1 parentca2e154 commita8d516aCopy full SHA for a8d516a

File tree

-5

lines changed

-5

lines changed

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`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ type internal FSharpCompletionProvider`
`296`	`296`	`if Settings.CodeFixes.AlwaysPlaceOpensAtTopLevelthen OpenStatementInsertionPoint.TopLevel`
`297`	`297`	`else OpenStatementInsertionPoint.Nearest`
`298`	`298`
`299`		`-let!ctx= ParsedInput.tryFindNearestPointToInsertOpenDeclaration line.LineNumber parsedInput fullNameIdents insertionPoint`
	`299`	`+letctx= ParsedInput.findNearestPointToInsertOpenDeclaration line.LineNumber parsedInput fullNameIdents insertionPoint`
`300`	`300`	`letfinalSourceText,changedSpanStartPos= OpenDeclarationHelper.insertOpenDeclaration textWithItemCommitted ctx ns`
`301`	`301`	`letfullChangingSpan= TextSpan.FromBounds(changedSpanStartPos, item.Span.End)`
`302`	`302`	`letchangedSpan= TextSpan.FromBounds(changedSpanStartPos, item.Span.End+(finalSourceText.Length- sourceText.Length))`

Comments

(0)