зеркало из https://github.com/dotnet/razor.git
Merge conflict
This commit is contained in:
Родитель
c1b73814e6
Коммит
c006265c5d
|
@ -2,7 +2,9 @@
|
|||
// Licensed under the MIT license. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using System.Collections.Immutable;
|
||||
using Microsoft.AspNetCore.Razor.LanguageServer.AutoInsert;
|
||||
using Microsoft.AspNetCore.Razor.LanguageServer.Common.Telemetry;
|
||||
using Microsoft.AspNetCore.Razor.LanguageServer.Debugging;
|
||||
using Microsoft.AspNetCore.Razor.LanguageServer.Definition;
|
||||
using Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics;
|
||||
|
@ -12,6 +14,7 @@ using Microsoft.AspNetCore.Razor.LanguageServer.Extensions;
|
|||
using Microsoft.AspNetCore.Razor.LanguageServer.Folding;
|
||||
using Microsoft.AspNetCore.Razor.LanguageServer.LinkedEditingRange;
|
||||
using Microsoft.AspNetCore.Razor.LanguageServer.Refactoring;
|
||||
using Microsoft.AspNetCore.Razor.LanguageServer.Telemetry;
|
||||
using Microsoft.AspNetCore.Razor.LanguageServer.WrapWithTag;
|
||||
using Microsoft.CodeAnalysis.Razor;
|
||||
using Microsoft.CodeAnalysis.Razor.Workspaces;
|
||||
|
@ -19,6 +22,7 @@ using Microsoft.CommonLanguageServerProtocol.Framework;
|
|||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.VisualStudio.Editor.Razor;
|
||||
using Microsoft.VisualStudio.Telemetry;
|
||||
using StreamJsonRpc;
|
||||
|
||||
namespace Microsoft.AspNetCore.Razor.LanguageServer;
|
||||
|
|
Загрузка…
Ссылка в новой задаче