Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Text;
using Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.Navigation;
using Microsoft.CodeAnalysis.Text;

namespace Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.NavigateTo;

internal readonly record struct OmniSharpNavigateToSearchResult(
string AdditionalInformation,
string Kind,
OmniSharpNavigateToMatchKind MatchKind,
bool IsCaseSensitive,
string Name,
ImmutableArray<TextSpan> NameMatchSpans,
string SecondarySort,
string Summary,
OmniSharpNavigableItem NavigableItem);

internal enum OmniSharpNavigateToMatchKind
{
Exact = 0,
Prefix = 1,
Substring = 2,
Regular = 3,
None = 4,
CamelCaseExact = 5,
CamelCasePrefix = 6,
CamelCaseNonContiguousPrefix = 7,
CamelCaseSubstring = 8,
CamelCaseNonContiguousSubstring = 9,
Fuzzy = 10
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.Navigation;
using Microsoft.CodeAnalysis.NavigateTo;
using Microsoft.CodeAnalysis.Shared.TestHooks;

namespace Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.NavigateTo;

internal static class OmniSharpNavigateToSearcher
{
public delegate Task OmniSharpNavigateToCallback(Project project, in OmniSharpNavigateToSearchResult result, CancellationToken cancellationToken);

public static Task SearchAsync(
Solution solution,
OmniSharpNavigateToCallback callback,
string searchPattern,
IImmutableSet<string> kinds,
CancellationToken cancellationToken)
{
var searcher = NavigateToSearcher.Create(
solution,
AsynchronousOperationListenerProvider.NullListener,
Comment thread
333fred marked this conversation as resolved.
new OmniSharpNavigateToCallbackImpl(callback),
searchPattern,
kinds,
disposalToken: CancellationToken.None);
Comment thread
333fred marked this conversation as resolved.

return searcher.SearchAsync(searchCurrentDocument: false, cancellationToken);
}

private class OmniSharpNavigateToCallbackImpl : INavigateToSearchCallback
Comment thread
333fred marked this conversation as resolved.
Outdated
{
private readonly OmniSharpNavigateToCallback _callback;

public OmniSharpNavigateToCallbackImpl(OmniSharpNavigateToCallback callback)
{
_callback = callback;
}

public Task AddItemAsync(Project project, INavigateToSearchResult result, CancellationToken cancellationToken)
{
var omniSharpResult = new OmniSharpNavigateToSearchResult(
result.AdditionalInformation,
result.Kind,
(OmniSharpNavigateToMatchKind)result.MatchKind,
result.IsCaseSensitive,
result.Name,
result.NameMatchSpans,
result.SecondarySort,
result.Summary,
new(result.NavigableItem.DisplayTaggedParts, result.NavigableItem.Document, result.NavigableItem.SourceSpan));

return _callback(project, omniSharpResult, cancellationToken);
}

public void Done(bool isFullyLoaded)
{
}

public void ReportProgress(int current, int maximum)
{
}
}
}
8 changes: 6 additions & 2 deletions src/Tools/ExternalAccess/OmniSharpTest/EnumTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
using System.Linq;
using Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.ExtractInterface;
using Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.ImplementType;
using Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.NavigateTo;
using Microsoft.CodeAnalysis.ExtractInterface;
using Microsoft.CodeAnalysis.ImplementType;
using Microsoft.CodeAnalysis.NavigateTo;
using Roslyn.Test.Utilities;
using Xunit;

namespace Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests
Expand All @@ -19,15 +22,16 @@ public class EnumTests
typeof(OmniSharpExtractInterfaceOptionsResult.OmniSharpExtractLocation))]
[InlineData(typeof(ImplementTypeInsertionBehavior), typeof(OmniSharpImplementTypeInsertionBehavior))]
[InlineData(typeof(ImplementTypePropertyGenerationBehavior), typeof(OmniSharpImplementTypePropertyGenerationBehavior))]
[InlineData(typeof(NavigateToMatchKind), typeof(OmniSharpNavigateToMatchKind))]
public void AssertEnumsInSync(Type internalType, Type externalType)
{
var internalValues = Enum.GetValues(internalType).Cast<int>().ToArray();
var internalNames = Enum.GetNames(internalType);
var externalValues = Enum.GetValues(externalType).Cast<int>().ToArray();
var externalNames = Enum.GetNames(externalType);

Assert.Equal(internalValues, externalValues);
Assert.Equal(internalNames, externalNames);
AssertEx.Equal(internalValues, externalValues);
AssertEx.Equal(internalNames, externalNames);
}
}
}