Commit1e7037c

authored and

committed

Fix IndexOutOfRangeException in check for providing completion (#4138)

* Fix IndexOutOfRange in check for providing completion:* Add test

1 parentd078571 commit1e7037cCopy full SHA for 1e7037c

File tree

+14

-3

lines changed

vsintegration
- src/FSharp.Editor/Completion
  - CompletionProvider.fs
- tests/unittests
  - CompletionProviderTests.fs

+14

-3

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,9 @@ type internal FSharpCompletionProvider`
`85`	`85`	`else`
`86`	`86`	`lettriggerPosition= caretPosition-1`
`87`	`87`	`lettriggerChar= sourceText.[triggerPosition]`
`88`		`-letprevChar= sourceText.[triggerPosition-1]`
`89`		`-`
	`88`	`+`
`90`	`89`	`// do not trigger completion if it's not single dot, i.e. range expression`
`91`		`-ifnot Settings.IntelliSense.ShowAfterCharIsTyped&&prevChar='.'then`
	`90`	`+ifnot Settings.IntelliSense.ShowAfterCharIsTyped&&triggerPosition>0&& sourceText.[triggerPosition-1]='.'then`
`92`	`91`	`false`
`93`	`92`	`else`
`94`	`93`	`letdocumentId,filePath,defines= getInfo()`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,18 @@ xVal**y`
`273`	`273`	`lettriggered= FSharpCompletionProvider.ShouldTriggerCompletionAux(SourceText.From(fileContents), caretPosition, CompletionTriggerKind.Insertion, getInfo)`
`274`	`274`	`Assert.IsTrue(triggered,"Completion should trigger after typing an identifier that follows a mathematical operation")`
`275`	`275`
	`276`	`+[<Test>]`
	`277`	`+letShouldTriggerCompletionAtStartOfFileWithInsertion=`
	`278`	`+letfileContents="""`
	`279`	`+l"""`
	`280`	`+`
	`281`	`+letmarker="l"`
	`282`	`+letcaretPosition= fileContents.IndexOf(marker)+ marker.Length`
	`283`	`+letdocumentId= DocumentId.CreateNewId(ProjectId.CreateNewId())`
	`284`	`+letgetInfo()= documentId, filePath,[]`
	`285`	`+lettriggered= FSharpCompletionProvider.ShouldTriggerCompletionAux(SourceText.From(fileContents), caretPosition, CompletionTriggerKind.Insertion, getInfo)`
	`286`	`+ Assert.IsTrue(triggered,"Completion should trigger after typing an Insertion character at the top of the file, e.g. a function definition in a new script file.")`
	`287`	`+`
`276`	`288`	`[<Test>]`
`277`	`289`	`letShouldDisplayTypeMembers()=`
`278`	`290`	`letfileContents="""`

Comments

(0)