Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdc0bf5e

Browse files
dotnet-botKevinRansom
authored andcommitted
Merge master to dev15.6 (dotnet#4071)
* do not simplify open statements (dotnet#4068)* Do not trigger completion on operators (dotnet#4054)* No triggered completion on operators* Check with classification data instead of stupid custom stuff* Fix silly tests* Feedback
1 parenta0414e7 commitdc0bf5e

File tree

9 files changed

+102
-17
lines changed

9 files changed

+102
-17
lines changed

‎src/fsharp/NameResolution.fs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,6 +1223,8 @@ type ItemOccurence =
12231223
| Implemented
12241224
/// Result gets suppressed over this text range
12251225
| RelatedText
1226+
/// This is a usage of a module or namespace name in open statement
1227+
| Open
12261228

12271229
typeOpenDeclaration=
12281230
{ LongId:Ident list

‎src/fsharp/NameResolution.fsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ type internal ItemOccurence =
246246
| Pattern
247247
| Implemented
248248
| RelatedText
249+
| Open
249250

250251
/// Check for equality, up to signature matching
251252
valItemsAreEffectivelyEqual:TcGlobals->Item->Item->bool

‎src/fsharp/TypeChecker.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ let OpenModulesOrNamespaces tcSink g amap scopem root env mvvs openDeclaration =
466466
loop acc rest
467467

468468
for item, range in loop [] (List.rev openDeclaration.LongId) do
469-
CallNameResolutionSink tcSink (range, env.NameEnv, item, item, emptyTyparInst, ItemOccurence.Use, env.DisplayEnv, env.eAccessRights)
469+
CallNameResolutionSink tcSink (range, env.NameEnv, item, item, emptyTyparInst, ItemOccurence.Open, env.DisplayEnv, env.eAccessRights)
470470
env
471471

472472
let AddRootModuleOrNamespaceRefs g amap m env modrefs =

‎src/fsharp/symbols/Symbols.fs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2281,19 +2281,19 @@ type FSharpSymbolUse(g:TcGlobals, denv: DisplayEnv, symbol:FSharpSymbol, itemOcc
22812281
member__.Symbol= symbol
22822282
member__.DisplayContext= FSharpDisplayContext(fun _-> denv)
22832283
memberx.IsDefinition= x.IsFromDefinition
2284-
member__.IsFromDefinition=(matchitemOccwith ItemOccurence.Binding->true|_->false)
2285-
member__.IsFromPattern=(matchitemOccwith ItemOccurence.Pattern->true|_->false)
2286-
member__.IsFromType=(matchitemOccwith ItemOccurence.UseInType->true|_->false)
2287-
member__.IsFromAttribute=(matchitemOccwith ItemOccurence.UseInAttribute->true|_->false)
2288-
member__.IsFromDispatchSlotImplementation=(matchitemOccwith ItemOccurence.Implemented->true|_->false)
2284+
member__.IsFromDefinition= itemOcc= ItemOccurence.Binding
2285+
member__.IsFromPattern= itemOcc= ItemOccurence.Pattern
2286+
member__.IsFromType= itemOcc= ItemOccurence.UseInType
2287+
member__.IsFromAttribute= itemOcc= ItemOccurence.UseInAttribute
2288+
member__.IsFromDispatchSlotImplementation= itemOcc= ItemOccurence.Implemented
22892289
member__.IsFromComputationExpression=
22902290
match symbol.Item, itemOccwith
22912291
// 'seq' in 'seq { ... }' gets colored as keywords
22922292
|(Item.Value vref), ItemOccurence.Usewhen valRefEq g g.seq_vref vref->true
22932293
// custom builders, custom operations get colored as keywords
22942294
|(Item.CustomBuilder_| Item.CustomOperation_), ItemOccurence.Use->true
22952295
|_->false
2296-
2296+
member__.IsFromOpenStatement= itemOcc= ItemOccurence.Open
22972297
member__.FileName= range.FileName
22982298
member__.Range= Range.toZ range
22992299
member__.RangeAlternate= range

‎src/fsharp/symbols/Symbols.fsi‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,6 +1125,9 @@ type internal FSharpSymbolUse =
11251125
/// Indicates if the reference is either a builder or a custom operation in a computation expression
11261126
memberIsFromComputationExpression:bool
11271127

1128+
/// Indicates if the reference is in open statement
1129+
memberIsFromOpenStatement:bool
1130+
11281131
/// The file name the reference occurs in
11291132
memberFileName:string
11301133

‎vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,17 @@ type internal FSharpCompletionProvider
8484
// Skip if we are not on a completion trigger
8585
else
8686
lettriggerPosition= caretPosition-1
87-
letc= sourceText.[triggerPosition]
87+
lettriggerChar= sourceText.[triggerPosition]
88+
letprevChar= sourceText.[triggerPosition-1]
8889

8990
// do not trigger completion if it's not single dot, i.e. range expression
90-
ifnot Settings.IntelliSense.ShowAfterCharIsTyped&&sourceText.[triggerPosition-1]='.'then
91+
ifnot Settings.IntelliSense.ShowAfterCharIsTyped&&prevChar='.'then
9192
false
92-
93-
// Trigger completion if we are on a valid classification type
9493
else
9594
letdocumentId,filePath,defines= getInfo()
9695
CompletionUtils.shouldProvideCompletion(documentId, filePath, defines, sourceText, triggerPosition)&&
97-
(c='.'||(Settings.IntelliSense.ShowAfterCharIsTyped&& CompletionUtils.isStartingNewWord(sourceText, triggerPosition)))
96+
(triggerChar='.'||(Settings.IntelliSense.ShowAfterCharIsTyped&& CompletionUtils.isStartingNewWord(sourceText, triggerPosition)))
97+
9898

9999
static memberProvideCompletionsAsyncAux(checker:FSharpChecker,sourceText:SourceText,caretPosition:int,options:FSharpProjectOptions,filePath:string,
100100
textVersionHash:int,getAllSymbols:unit->AssemblySymbol list)=

‎vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,19 @@ module internal CompletionUtils =
8282
letisStartingNewWord(sourceText,position)=
8383
CommonCompletionUtilities.IsStartingNewWord(sourceText, position,(fun ch-> isIdentifierStartCharacter ch),(fun ch-> isIdentifierPartCharacter ch))
8484

85-
letshouldProvideCompletion(documentId:DocumentId,filePath:string,defines:string list,text:SourceText,position:int):bool=
86-
lettextLines=text.Lines
87-
lettriggerLine= textLines.GetLineFromPositionposition
88-
letcolorizationData= Tokenizer.getColorizationData(documentId,text, triggerLine.Span, Some filePath, defines, CancellationToken.None)
85+
letshouldProvideCompletion(documentId:DocumentId,filePath:string,defines:string list,sourceText:SourceText,triggerPosition:int):bool=
86+
lettextLines=sourceText.Lines
87+
lettriggerLine= textLines.GetLineFromPositiontriggerPosition
88+
letcolorizationData= Tokenizer.getColorizationData(documentId,sourceText, triggerLine.Span, Some filePath, defines, CancellationToken.None)
8989
colorizationData.Count=0||// we should provide completion at the start of empty line, where there are no tokens at all
9090
colorizationData.Exists(fun classifiedSpan->
91-
classifiedSpan.TextSpan.IntersectsWithposition&&
91+
classifiedSpan.TextSpan.IntersectsWithtriggerPosition&&
9292
(
9393
match classifiedSpan.ClassificationTypewith
9494
| ClassificationTypeNames.Comment
9595
| ClassificationTypeNames.StringLiteral
9696
| ClassificationTypeNames.ExcludedCode
97+
| ClassificationTypeNames.Operator
9798
| ClassificationTypeNames.NumericLiteral->false
9899
|_->true// anything else is a valid classification type
99100
))

‎vsintegration/src/FSharp.Editor/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ type internal SimplifyNameDiagnosticAnalyzer() =
6666
let mutableresult= ResizeArray()
6767
letsymbolUses=
6868
symbolUses
69+
|> Array.filter(fun symbolUse->not symbolUse.IsFromOpenStatement)
6970
|> Array.Parallel.map(fun symbolUse->
7071
letlineStr= sourceText.Lines.[Line.toZ symbolUse.RangeAlternate.StartLine].ToString()
7172
// for `System.DateTime.Now` it returns ([|"System"; "DateTime"|], "Now")

‎vsintegration/tests/unittests/CompletionProviderTests.fs‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,83 @@ System.Console.WriteLine()
196196
lettriggered= FSharpCompletionProvider.ShouldTriggerCompletionAux(SourceText.From(fileContents), caretPosition, CompletionTriggerKind.Insertion, getInfo)
197197
Assert.IsFalse(triggered,"FSharpCompletionProvider.ShouldTriggerCompletionAux() should not trigger")
198198

199+
[<Test>]
200+
letShouldNotTriggerCompletionInOperatorWithDot()=
201+
// Simulate mistyping '|>' as '|.'
202+
letfileContents="""
203+
let f() =
204+
12.0 |. sqrt
205+
"""
206+
letcaretPosition= fileContents.IndexOf("|.")
207+
letdocumentId= DocumentId.CreateNewId(ProjectId.CreateNewId())
208+
letgetInfo()= documentId, filePath,[]
209+
lettriggered= FSharpCompletionProvider.ShouldTriggerCompletionAux(SourceText.From(fileContents), caretPosition, CompletionTriggerKind.Insertion, getInfo)
210+
Assert.IsFalse(triggered,"FSharpCompletionProvider.ShouldTriggerCompletionAux() should not trigger on operators")
211+
212+
[<Test>]
213+
letShouldTriggerCompletionInAttribute()=
214+
letfileContents="""
215+
[<A
216+
module Foo = module end
217+
"""
218+
letmarker="A"
219+
letcaretPosition= fileContents.IndexOf(marker)+ marker.Length
220+
letdocumentId= DocumentId.CreateNewId(ProjectId.CreateNewId())
221+
letgetInfo()= documentId, filePath,[]
222+
lettriggered= FSharpCompletionProvider.ShouldTriggerCompletionAux(SourceText.From(fileContents), caretPosition, CompletionTriggerKind.Insertion, getInfo)
223+
Assert.IsTrue(triggered,"Completion should trigger on Attributes.")
224+
225+
[<Test>]
226+
letShouldTriggerCompletionAfterDerefOperator()=
227+
letfileContents="""
228+
let foo = ref 12
229+
printfn "%d" !f
230+
"""
231+
letmarker="!f"
232+
letcaretPosition= fileContents.IndexOf(marker)+ marker.Length
233+
letdocumentId= DocumentId.CreateNewId(ProjectId.CreateNewId())
234+
letgetInfo()= documentId, filePath,[]
235+
lettriggered= FSharpCompletionProvider.ShouldTriggerCompletionAux(SourceText.From(fileContents), caretPosition, CompletionTriggerKind.Insertion, getInfo)
236+
Assert.IsTrue(triggered,"Completion should trigger after typing an identifier that follows a dereference operator (!).")
237+
238+
[<Test>]
239+
letShouldTriggerCompletionAfterAddressOfOperator()=
240+
letfileContents="""
241+
type Point = { mutable X: int; mutable Y: int }
242+
let pnt = { X = 1; Y = 2 }
243+
use ptr = fixed &p
244+
"""
245+
letmarker="&p"
246+
letcaretPosition= fileContents.IndexOf(marker)+ marker.Length
247+
letdocumentId= DocumentId.CreateNewId(ProjectId.CreateNewId())
248+
letgetInfo()= documentId, filePath,[]
249+
lettriggered= FSharpCompletionProvider.ShouldTriggerCompletionAux(SourceText.From(fileContents), caretPosition, CompletionTriggerKind.Insertion, getInfo)
250+
Assert.IsTrue(triggered,"Completion should trigger after typing an identifier that follows an addressOf operator (&).")
251+
252+
[<Test>]
253+
letShouldTriggerCompletionAfterArithmeticOperation()=
254+
letfileContents="""
255+
let xVal = 1.0
256+
let yVal = 2.0
257+
let zVal
258+
259+
xVal+y
260+
xVal-y
261+
xVal*y
262+
xVal/y
263+
xVal%y
264+
xVal**y
265+
"""
266+
267+
letmarkers=["+y";"-y";"*y";"/y";"%y";"**y"]
268+
269+
for markerin markersdo
270+
letcaretPosition= fileContents.IndexOf(marker)+ marker.Length
271+
letdocumentId= DocumentId.CreateNewId(ProjectId.CreateNewId())
272+
letgetInfo()= documentId, filePath,[]
273+
lettriggered= FSharpCompletionProvider.ShouldTriggerCompletionAux(SourceText.From(fileContents), caretPosition, CompletionTriggerKind.Insertion, getInfo)
274+
Assert.IsTrue(triggered,"Completion should trigger after typing an identifier that follows a mathematical operation")
275+
199276
[<Test>]
200277
letShouldDisplayTypeMembers()=
201278
letfileContents="""

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp