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

Commit90eafa1

Browse files
authored
Update references to Roslyn RC3 bits. (dotnet#2168)
* enable Roslyn's non blocking code completeupdate Microsoft.CodeAnalysis.xxx packages to version 2.0.0-rc3-61225-01* update references from `IFindReferencesService` to `IFindUsagesService`
1 parent192d05f commit90eafa1

File tree

6 files changed

+33
-26
lines changed

6 files changed

+33
-26
lines changed

‎.nuget/NuGet.Config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<addkey="myget.org roslyn-tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1515
<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />
1616
<addkey="vctools"value="https://vcppdogfooding.azurewebsites.net/nuget/" />
17+
<addkey="roslyn"value="https://dotnet.myget.org/F/roslyn" />
1718
<addkey="artifacts"value="../artifacts" />
1819
</packageSources>
1920
</configuration>

‎src/FSharpSource.Settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<FsiToolExe>fsi.exe</FsiToolExe>
122122
<FsLexToolExe>fslex.exe</FsLexToolExe>
123123
<FsYaccToolExe>fsyacc.exe</FsYaccToolExe>
124-
<RoslynVersion>2.0.0-rc2</RoslynVersion>
124+
<RoslynVersion>2.0.0-rc3-61225-01</RoslynVersion>
125125
<RoslynVSBinariesVersion>14.0</RoslynVSBinariesVersion>
126126
<RoslynVSPackagesVersion>14.3.25407</RoslynVSPackagesVersion>
127127

‎vsintegration/packages.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="Microsoft.CodeAnalysis.Common"version="2.0.0-rc2"targetFramework="net46" />
4-
<packageid="Microsoft.CodeAnalysis.EditorFeatures"version="2.0.0-rc2"targetFramework="net46" />
5-
<packageid="Microsoft.CodeAnalysis.EditorFeatures.Text"version="2.0.0-rc2"targetFramework="net46" />
6-
<packageid="Microsoft.CodeAnalysis.Features"version="2.0.0-rc2"targetFramework="net46" />
7-
<packageid="Microsoft.CodeAnalysis.Workspaces.Common"version="2.0.0-rc2"targetFramework="net46" />
8-
<packageid="Microsoft.VisualStudio.LanguageServices"version="2.0.0-rc2"targetFramework="net46" />
3+
<packageid="Microsoft.CodeAnalysis.Common"version="2.0.0-rc3-61225-01"targetFramework="net46" />
4+
<packageid="Microsoft.CodeAnalysis.EditorFeatures"version="2.0.0-rc3-61225-01"targetFramework="net46" />
5+
<packageid="Microsoft.CodeAnalysis.EditorFeatures.Text"version="2.0.0-rc3-61225-01"targetFramework="net46" />
6+
<packageid="Microsoft.CodeAnalysis.Features"version="2.0.0-rc3-61225-01"targetFramework="net46" />
7+
<packageid="Microsoft.CodeAnalysis.Workspaces.Common"version="2.0.0-rc3-61225-01"targetFramework="net46" />
8+
<packageid="Microsoft.VisualStudio.LanguageServices"version="2.0.0-rc3-61225-01"targetFramework="net46" />
99
<packageid="Microsoft.Composition"version="1.0.27"targetFramework="net46" />
1010
<packageid="Microsoft.VisualStudio.Package.LanguageService.14.0"version="14.3.25407"targetFramework="net46" />
1111
<packageid="Microsoft.VisualStudio.Editor"version="14.3.25407"targetFramework="net46" />

‎vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<CompileInclude="Navigation\GoToDefinitionService.fs" />
5656
<CompileInclude="Navigation\NavigationBarItemService.fs" />
5757
<CompileInclude="Navigation\NavigateToSearchService.fs" />
58-
<CompileInclude="Navigation\FindReferencesService.fs" />
58+
<CompileInclude="Navigation\FindUsagesService.fs" />
5959
<CompileInclude="BlockComment\CommentUncommentService.fs" />
6060
<CompileInclude="Structure\Structure.fs" />
6161
<CompileInclude="Structure\BlockStructureService.fs" />

‎vsintegration/src/FSharp.Editor/InlineRename/InlineRenameService.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ type internal DocumentLocations =
4444

4545
typeinternalInlineRenameLocationSet(locationsByDocument: DocumentLocations[],originalSolution: Solution)=
4646
interface IInlineRenameLocationSetwith
47-
member__.Locations:IList<InlineRenameLocation>=
48-
[|for docin locationsByDocumentdoyield! doc.Locations|]:>_
47+
member__.Locations:ImmutableArray<InlineRenameLocation>=
48+
[|for docin locationsByDocumentdoyield! doc.Locations|].ToImmutableArray()
4949

5050
memberthis.GetReplacementsAsync(replacementText,_optionSet,cancellationToken):Task<IInlineRenameReplacementInfo>=
5151
let recapplyChanges i(solution:Solution)=
@@ -166,4 +166,4 @@ type internal InlineRenameService
166166
return! InlineRenameService.GetInlineRenameInfo(checkerProvider.Checker, projectInfoManager, document, sourceText, position, defines, options)
167167
}
168168
|> Async.map(Option.defaultValue FailureInlineRenameInfo.Instance)
169-
|> CommonRoslynHelpers.StartAsyncAsTask(cancellationToken)
169+
|> CommonRoslynHelpers.StartAsyncAsTask(cancellationToken)

‎vsintegration/src/FSharp.Editor/Navigation/FindReferencesService.fs‎renamed to ‎vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@ open System.Composition
1010
openMicrosoft.CodeAnalysis
1111
openMicrosoft.CodeAnalysis.Host.Mef
1212
openMicrosoft.CodeAnalysis.Editor
13+
openMicrosoft.CodeAnalysis.Editor.FindUsages
1314
openMicrosoft.CodeAnalysis.Editor.Host
1415
openMicrosoft.CodeAnalysis.Navigation
1516
openMicrosoft.CodeAnalysis.FindSymbols
16-
openMicrosoft.CodeAnalysis.FindReferences
17+
openMicrosoft.CodeAnalysis.FindUsages
1718

1819
openMicrosoft.VisualStudio.FSharp.LanguageService
1920

2021
openMicrosoft.FSharp.Compiler.Range
2122
openMicrosoft.FSharp.Compiler.SourceCodeServices
2223

23-
[<ExportLanguageService(typeof<IStreamingFindReferencesService>, FSharpCommonConstants.FSharpLanguageName); Shared>]
24-
typeinternalFSharpFindReferencesService
24+
[<ExportLanguageService(typeof<IFindUsagesService>, FSharpCommonConstants.FSharpLanguageName); Shared>]
25+
typeinternalFSharpFindUsagesService
2526
[<ImportingConstructor>]
2627
(
2728
checkerProvider: FSharpCheckerProvider,
@@ -49,7 +50,7 @@ type internal FSharpFindReferencesService
4950
return spans|> Array.choose id|> Array.toList
5051
}
5152

52-
letfindReferencedSymbolsAsync(document:Document,position:int,context:FindReferencesContext):Async<unit>=
53+
letfindReferencedSymbolsAsync(document:Document,position:int,context:IFindUsagesContext,allReferences:bool):Async<unit>=
5354
asyncMaybe{
5455
let!sourceText= document.GetTextAsync(context.CancellationToken)
5556
letchecker= checkerProvider.Checker
@@ -126,20 +127,25 @@ type internal FSharpFindReferencesService
126127
match declarationRangewith
127128
| Some declRangewhen declRange= symbolUse.RangeAlternate->()
128129
|_->
129-
let!referenceDocSpans= rangeToDocumentSpans(document.Project.Solution, symbolUse.RangeAlternate, context.CancellationToken)|> liftAsync
130-
match referenceDocSpanswith
131-
|[]->()
132-
|_->
133-
for referenceDocSpanin referenceDocSpansdo
134-
for definitionItemin definitionItemsdo
135-
letreferenceItem= SourceReferenceItem(definitionItem, referenceDocSpan)
136-
do! context.OnReferenceFoundAsync(referenceItem)|> Async.AwaitTask|> liftAsync
130+
// report a reference if we're interested in all _or_ if we're looking at an implementation
131+
if allReferences|| symbolUse.IsFromDispatchSlotImplementationthen
132+
let!referenceDocSpans= rangeToDocumentSpans(document.Project.Solution, symbolUse.RangeAlternate, context.CancellationToken)|> liftAsync
133+
match referenceDocSpanswith
134+
|[]->()
135+
|_->
136+
for referenceDocSpanin referenceDocSpansdo
137+
for definitionItemin definitionItemsdo
138+
letreferenceItem= SourceReferenceItem(definitionItem, referenceDocSpan)
139+
do! context.OnReferenceFoundAsync(referenceItem)|> Async.AwaitTask|> liftAsync
137140

138-
do! context.OnCompletedAsync()|> Async.AwaitTask|> liftAsync
141+
()
139142
}|> Async.Ignore
140143

141-
interfaceIStreamingFindReferencesServicewith
144+
interfaceIFindUsagesServicewith
142145
member__.FindReferencesAsync(document,position,context)=
143-
findReferencedSymbolsAsync(document, position, context)
146+
findReferencedSymbolsAsync(document, position, context,true)
147+
|> CommonRoslynHelpers.StartAsyncUnitAsTask(context.CancellationToken)
148+
member__.FindImplementationsAsync(document,position,context)=
149+
findReferencedSymbolsAsync(document, position, context,false)
144150
|> CommonRoslynHelpers.StartAsyncUnitAsTask(context.CancellationToken)
145151

0 commit comments

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