Skip to content

Commit

Permalink
Merge pull request #2216 from JoeRobich/get-full-path
Browse files Browse the repository at this point in the history 
Use FullPaths for Locations that are returned with relative paths.
  • Loading branch information
@JoeRobich
JoeRobich authored Aug 27, 2021
2 parents 6e7ec26 + db0d373 commit 2806e36
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 24 deletions.
7 changes: 6 additions & 1 deletion src/OmniSharp.Roslyn.CSharp/Helpers/LocationExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@ public static QuickFix GetQuickFix(this Location location, OmniSharpWorkspace wo
var sourceText = GetSourceText(location, documents, lineSpan.HasMappedPath);
var text = GetLineText(location, sourceText, lineSpan.StartLinePosition.Line);

var fileName = Path.IsPathRooted(lineSpan.Path)
? lineSpan.Path
// when a #line directive maps into a separate file using a relative path, get the full path relative to the folder containing the source tree
: Path.GetFullPath(Path.Combine(Path.GetDirectoryName(location.SourceTree.FilePath), lineSpan.Path));

return new QuickFix
{
Text = text.Trim(),
FileName = lineSpan.Path,
FileName = fileName,
Line = lineSpan.StartLinePosition.Line,
Column = lineSpan.HasMappedPath ? 0 : lineSpan.StartLinePosition.Character, // when a #line directive maps into a separate file, assume columns (0,0)
EndLine = lineSpan.EndLinePosition.Line,
Expand Down
6 changes: 3 additions & 3 deletions tests/OmniSharp.Lsp.Tests/ReferencesHandlerFacts.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ public FooConsumer()
var regularResult = usages.ElementAt(0);
var mappedResult = usages.ElementAt(1);

Assert.Equal("a.cs", regularResult.Uri);
Assert.Equal("b.cs", mappedResult.Uri);
Assert.EndsWith("a.cs", regularResult.Uri.Path);
Assert.EndsWith("b.cs", mappedResult.Uri.Path);

Assert.Equal(3, regularResult.Range.Start.Line);
Assert.Equal(mappingLine - 1, mappedResult.Range.Start.Line);
Expand Down Expand Up @@ -405,7 +405,7 @@ public Vector2Consumer()

private Task<LocationContainer> FindUsagesAsync(string code, bool excludeDefinition = false)
{
return FindUsagesAsync(new[] {new TestFile("dummy.cs", code)}, excludeDefinition);
return FindUsagesAsync(new[] { new TestFile("dummy.cs", code) }, excludeDefinition);
}

private async Task<LocationContainer> FindUsagesAsync(TestFile[] testFiles, bool excludeDefinition = false)
Expand Down
3 changes: 2 additions & 1 deletion tests/OmniSharp.Roslyn.CSharp.Tests/FindImplementationFacts.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis;
Expand Down Expand Up @@ -212,7 +213,7 @@ private async Task<IEnumerable<ISymbol>> SymbolsFromQuickFixesAsync(OmniSharpWor
var symbols = new List<ISymbol>();
foreach (var quickfix in quickFixes)
{
var document = workspace.GetDocument(quickfix.FileName);
var document = workspace.GetDocument(Path.GetFileName(quickfix.FileName));
var sourceText = await document.GetTextAsync();
var position = sourceText.Lines.GetPosition(new LinePosition(quickfix.Line, quickfix.Column));
var semanticModel = await document.GetSemanticModelAsync();
Expand Down
67 changes: 48 additions & 19 deletions tests/OmniSharp.Roslyn.CSharp.Tests/FindReferencesFacts.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using OmniSharp.Models;
Expand Down Expand Up @@ -132,7 +133,7 @@ public class FooConsumer
{
public FooConsumer()
{
#line " + mappingLine+ @"
#line " + mappingLine + @"
new Foo().bar();
#line default
}
Expand All @@ -145,14 +146,14 @@ public FooConsumer()
var regularResult = quickFixes.ElementAt(0);
var mappedResult = quickFixes.ElementAt(1);

Assert.Equal("dummy.cs", regularResult.FileName);
Assert.Equal("dummy.cs", mappedResult.FileName);
Assert.EndsWith("dummy.cs", regularResult.FileName);
Assert.EndsWith("dummy.cs", mappedResult.FileName);

Assert.Equal("public void bar() { }", regularResult.Text);
Assert.Equal(expectedMappingText, mappedResult.Text);

Assert.Equal(3, regularResult.Line);
Assert.Equal(mappingLine-1, mappedResult.Line);
Assert.Equal(mappingLine - 1, mappedResult.Line);

// regular result has regular postition
Assert.Equal(32, regularResult.Column);
Expand Down Expand Up @@ -186,7 +187,7 @@ public FooConsumer()
#line default
}
}"),

};

if (mappedFileExistsInWorkspace)
Expand All @@ -201,11 +202,11 @@ public FooConsumer()
var regularResult = usages.QuickFixes.ElementAt(0);
var mappedResult = usages.QuickFixes.ElementAt(1);

Assert.Equal("a.cs", regularResult.FileName);
Assert.Equal("b.cs", mappedResult.FileName);
Assert.EndsWith("a.cs", regularResult.FileName);
Assert.EndsWith("b.cs", mappedResult.FileName);

Assert.Equal(3, regularResult.Line);
Assert.Equal(mappingLine-1, mappedResult.Line);
Assert.Equal(mappingLine - 1, mappedResult.Line);

Assert.Equal("public void bar() { }", regularResult.Text);
Assert.Equal(expectedMappingText, mappedResult.Text);
Expand Down Expand Up @@ -251,8 +252,8 @@ public FooConsumer()
var regularResult = usages.QuickFixes.ElementAt(0);
var mappedResult = usages.QuickFixes.ElementAt(1);

Assert.Equal("a.cs", regularResult.FileName);
Assert.Equal("a.cs", mappedResult.FileName);
Assert.EndsWith("a.cs", regularResult.FileName);
Assert.EndsWith("a.cs", mappedResult.FileName);

Assert.Equal(3, regularResult.Line);
Assert.Equal(11, mappedResult.Line);
Expand Down Expand Up @@ -407,14 +408,42 @@ public Foo Clone() {

var usages = await FindUsagesAsync(testFiles, onlyThisFile: false);
Assert.Equal(3, usages.QuickFixes.Count());
Assert.Equal("a.cs", usages.QuickFixes.ElementAt(0).FileName);
Assert.Equal("a.cs", usages.QuickFixes.ElementAt(1).FileName);
Assert.Equal("b.cs", usages.QuickFixes.ElementAt(2).FileName);
Assert.EndsWith("a.cs", usages.QuickFixes.ElementAt(0).FileName);
Assert.EndsWith("a.cs", usages.QuickFixes.ElementAt(1).FileName);
Assert.EndsWith("b.cs", usages.QuickFixes.ElementAt(2).FileName);

usages = await FindUsagesAsync(testFiles, onlyThisFile: true);
Assert.Equal(2, usages.QuickFixes.Count());
Assert.Equal("a.cs", usages.QuickFixes.ElementAt(0).FileName);
Assert.Equal("a.cs", usages.QuickFixes.ElementAt(1).FileName);
Assert.EndsWith("a.cs", usages.QuickFixes.ElementAt(0).FileName);
Assert.EndsWith("a.cs", usages.QuickFixes.ElementAt(1).FileName);
}

[Fact]
public async Task MappedLocationFileNameProperlyRooted()
{
var relativeFile = ".\\pages\\test.xaml";

var testFiles = new[]
{
new TestFile("a.cs",
@"public class Bar : F$$oo {}"),
new TestFile("b.cs", $@"
#line 23 ""{relativeFile}""
public class Foo {{ }}
#line default
#line hidden")
};

var usages = await FindUsagesAsync(testFiles, onlyThisFile: false);

Assert.DoesNotContain(usages.QuickFixes, location => location.FileName.EndsWith("b.cs"));
Assert.DoesNotContain(usages.QuickFixes, location => location.FileName.Equals(relativeFile));

var project = SharedOmniSharpTestHost.Workspace.CurrentSolution.Projects.Single();
var projectFolder = Path.GetDirectoryName(project.FilePath);
var mappedFilePath = Path.GetFullPath(Path.Combine(projectFolder, relativeFile));

Assert.Single(usages.QuickFixes, location => location.FileName.Equals(mappedFilePath));
}

[Fact]
Expand All @@ -434,7 +463,7 @@ public Foo Clone() {

var usages = await FindUsagesAsync(testFiles, onlyThisFile: true);
Assert.Single(usages.QuickFixes);
Assert.Equal("a.cs", usages.QuickFixes.ElementAt(0).FileName);
Assert.EndsWith("a.cs", usages.QuickFixes.ElementAt(0).FileName);
}

[Theory]
Expand All @@ -449,13 +478,13 @@ public class Foo
{{
}}
}}";
var exception = await Record.ExceptionAsync(async () =>

var exception = await Record.ExceptionAsync(async () =>
{
var usages = await FindUsagesAsync(code);
Assert.NotNull(usages);
});

Assert.Null(exception);
}

Expand Down

0 comments on commit 2806e36

Please sign in to comment.