Skip to content

Commit 262aef8

Browse files
author
Omar Tawfik
committed
Divided editor and tests into feature folders
1 parent d9a24ca commit 262aef8

File tree

6 files changed

+26
-9
lines changed

6 files changed

+26
-9
lines changed

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,21 @@
3030
</PropertyGroup>
3131
<ItemGroup>
3232
<Compile Include="AssemblyInfo.fs" />
33-
<Compile Include="ColorizationService.fs" />
34-
<Compile Include="BraceMatchingService.fs" />
35-
<Compile Include="IndentationService.fs" />
36-
<Compile Include="BreakpointResolutionService.fs" />
37-
<Compile Include="LanguageDebugInfoService.fs" />
33+
<Compile Include="ColorizationService.fs">
34+
<Link>Classification\ColorizationService.fs</Link>
35+
</Compile>
36+
<Compile Include="BraceMatchingService.fs">
37+
<Link>Utilities\BraceMatchingService.fs</Link>
38+
</Compile>
39+
<Compile Include="IndentationService.fs">
40+
<Link>Utilities\IndentationService.fs</Link>
41+
</Compile>
42+
<Compile Include="BreakpointResolutionService.fs">
43+
<Link>Debugging\BreakpointResolutionService.fs</Link>
44+
</Compile>
45+
<Compile Include="LanguageDebugInfoService.fs">
46+
<Link>Debugging\LanguageDebugInfoService.fs</Link>
47+
</Compile>
3848
<Compile Include="ProjectSiteService.fs" />
3949
<Compile Include="ContentType.fs" />
4050
</ItemGroup>

vsintegration/src/FSharp.Editor/LanguageDebugInfoService.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ type internal FSharpLanguageDebugInfoService() =
4747
match QuickParse.GetCompleteIdentifierIsland false (textLine.ToString()) (position - textLine.Start) with
4848
| None -> Unchecked.defaultof<DebugDataTipInfo>
4949
| Some(island, islandPosition, _) -> new DebugDataTipInfo(TextSpan.FromBounds(islandPosition, islandPosition + island.Length), island)
50-
50+
51+
// FSROSLYNTODO: enable numeric literal and identifier data tips in VS
5152
match token.ClassificationType with
5253
| ClassificationTypeNames.NumericLiteral -> constructLiteralDataTip()
5354
| ClassificationTypeNames.StringLiteral -> constructLiteralDataTip()

vsintegration/tests/unittests/Tests.Roslyn.BraceMatchingService.fs renamed to vsintegration/tests/unittests/BraceMatchingServiceTests.fs

File renamed without changes.

vsintegration/tests/unittests/Tests.Roslyn.ColorizationService.fs renamed to vsintegration/tests/unittests/ColorizationServiceTests.fs

File renamed without changes.

vsintegration/tests/unittests/Tests.Roslyn.IndentationService.fs renamed to vsintegration/tests/unittests/IndentationServiceTests.fs

File renamed without changes.

vsintegration/tests/unittests/VisualFSharp.Unittests.fsproj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,15 @@
3434
<Compile Include="TestLib.Salsa.fs" />
3535
<Compile Include="TestLib.LanguageService.fs" />
3636
<Compile Include="TestLib.ProjectSystem.fs" />
37-
<Compile Include="Tests.Roslyn.ColorizationService.fs" />
38-
<Compile Include="Tests.Roslyn.BraceMatchingService.fs" />
39-
<Compile Include="Tests.Roslyn.IndentationService.fs" />
37+
<Compile Include="ColorizationServiceTests.fs">
38+
<Link>Roslyn\Classification\ColorizationServiceTests.fs</Link>
39+
</Compile>
40+
<Compile Include="BraceMatchingServiceTests.fs">
41+
<Link>Roslyn\Utilities\BraceMatchingServiceTests.fs</Link>
42+
</Compile>
43+
<Compile Include="IndentationServiceTests.fs">
44+
<Link>Roslyn\Utilities\IndentationServiceTests.fs</Link>
45+
</Compile>
4046
<Compile Include="Tests.InternalCollections.fs" />
4147
<Compile Include="Tests.Build.fs" />
4248
<Compile Include="Tests.TaskReporter.fs" />

0 commit comments

Comments
 (0)