Merge pull request #7954 from DustinCampbell/cleanup-resources

Cleanup string resources and make accessing them consistent
This commit is contained in:
Dustin Campbell 2022-11-23 15:33:56 -08:00 коммит произвёл GitHub
Родитель 1d21f9bae4 62d7549a67
Коммит 78dd9383cb
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
134 изменённых файлов: 206 добавлений и 142 удалений

Просмотреть файл

@ -7,15 +7,6 @@
<IsShippingPackage>false</IsShippingPackage>
</PropertyGroup>
<ItemGroup Label="String Resources">
<EmbeddedResource Update="Resources\SR.resx">
<GenerateSource>true</GenerateSource>
<Namespace>Microsoft.AspNetCore.Razor.Common.Resources</Namespace>
</EmbeddedResource>
<Using Include="Microsoft.AspNetCore.Razor.Common.Resources" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVisualStudioTelemetryVersion)" />
@ -28,4 +19,13 @@
<ProjectReference Include="$(SharedSourceRoot)\Microsoft.AspNetCore.Razor.LanguageSupport\Microsoft.AspNetCore.Razor.LanguageSupport.csproj" />
</ItemGroup>
<ItemGroup Label="String Resources">
<EmbeddedResource Update="Resources\SR.resx">
<GenerateSource>true</GenerateSource>
<Namespace>$(ProjectName).Resources</Namespace>
</EmbeddedResource>
<Using Include="$(ProjectName).Resources" />
</ItemGroup>
</Project>

Просмотреть файл

@ -40,7 +40,7 @@ internal class AdhocLanguageServices : HostLanguageServices
if (service is null)
{
throw new InvalidOperationException(RazorLSCommon.Resources.FormatLanguage_Services_Missing_Service(typeof(TLanguageService).FullName));
throw new InvalidOperationException(SR.FormatLanguage_Services_Missing_Service(typeof(TLanguageService).FullName));
}
return service;

Просмотреть файл

@ -344,7 +344,7 @@ internal class BackgroundDocumentGenerator : ProjectSnapshotChangeTrigger
}
default:
throw new InvalidOperationException(RazorLSCommon.Resources.FormatUnknown_ProjectChangeKind(args.Kind));
throw new InvalidOperationException(SR.FormatUnknown_ProjectChangeKind(args.Kind));
}
}

Просмотреть файл

@ -56,7 +56,7 @@ public class DefaultRemoteTextLoaderFactory : RemoteTextLoaderFactory
var newLastWriteTime = File.GetLastWriteTimeUtc(_filePath);
if (!newLastWriteTime.Equals(prevLastWriteTime))
{
throw new IOException(RazorLSCommon.Resources.FormatFile_Externally_Modified(_filePath));
throw new IOException(SR.FormatFile_Externally_Modified(_filePath));
}
}
catch (IOException)

Просмотреть файл

@ -14,4 +14,13 @@
<ProjectReference Include="..\..\..\Compiler\Microsoft.AspNetCore.Mvc.Razor.Extensions\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" />
</ItemGroup>
<ItemGroup Label="String Resources">
<EmbeddedResource Update="Resources\SR.resx">
<GenerateSource>true</GenerateSource>
<Namespace>$(ProjectName).Resources</Namespace>
</EmbeddedResource>
<Using Include="$(ProjectName).Resources" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="cs" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="cs" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="de" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="de" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="es" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="es" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="fr" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="fr" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="it" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="it" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ja" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="ja" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ko" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="ko" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pl" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="pl" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pt-BR" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="pt-BR" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ru" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="ru" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="tr" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="tr" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../RazorLSCommon.Resources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../SR.resx">
<body>
<trans-unit id="File_Externally_Modified">
<source>File was externally modified: {0}</source>

Просмотреть файл

@ -41,7 +41,7 @@ internal static class RazorCodeActionFactory
public static RazorVSInternalCodeAction CreateComponentFromTag(RazorCodeActionResolutionParams resolutionParams)
{
var title = RazorLS.Resources.Create_Component_FromTag_Title;
var title = SR.Create_Component_FromTag_Title;
var data = JToken.FromObject(resolutionParams);
var codeAction = new RazorVSInternalCodeAction()
{
@ -54,7 +54,7 @@ internal static class RazorCodeActionFactory
public static RazorVSInternalCodeAction CreateExtractToCodeBehind(RazorCodeActionResolutionParams resolutionParams)
{
var title = RazorLS.Resources.ExtractTo_CodeBehind_Title;
var title = SR.ExtractTo_CodeBehind_Title;
var data = JToken.FromObject(resolutionParams);
var codeAction = new RazorVSInternalCodeAction()
{

Просмотреть файл

@ -32,7 +32,7 @@ internal class DirectiveAttributeTransitionCompletionItemProvider : DirectiveAtt
// where this directive attribute transition character ("@...") gets provided and then typing
// `@` should re-trigger OR typing `/` should re-trigger.
commitCharacters: RazorCommitCharacter.FromArray(new[] { "@", "/", ">" }));
s_transitionCompletionItem.SetDirectiveCompletionDescription(new DirectiveCompletionDescription(RazorLS.Resources.Blazor_directive_attributes));
s_transitionCompletionItem.SetDirectiveCompletionDescription(new DirectiveCompletionDescription(SR.Blazor_directive_attributes));
}
return s_transitionCompletionItem;

Просмотреть файл

@ -29,7 +29,7 @@ internal class LegacyRazorCompletionEndpoint : IVSCompletionEndpoint
private static readonly Command s_retriggerCompletionCommand = new()
{
CommandIdentifier = "editor.action.triggerSuggest",
Title = RazorLS.Resources.ReTrigger_Completions_Title,
Title = SR.ReTrigger_Completions_Title,
};
private VSInternalClientCapabilities? _clientCapabilities;

Просмотреть файл

@ -26,7 +26,7 @@ internal class RazorCompletionListProvider
private static readonly Command s_retriggerCompletionCommand = new()
{
CommandIdentifier = "editor.action.triggerSuggest",
Title = RazorLS.Resources.ReTrigger_Completions_Title,
Title = SR.ReTrigger_Completions_Title,
};
public RazorCompletionListProvider(

Просмотреть файл

@ -249,7 +249,7 @@ internal class DefaultRazorDocumentMappingService : RazorDocumentMappingService
}
else
{
throw new InvalidOperationException(RazorLS.Resources.Unknown_mapping_behavior);
throw new InvalidOperationException(SR.Unknown_mapping_behavior);
}
}

Просмотреть файл

@ -2,7 +2,6 @@
// Licensed under the MIT license. See License.txt in the project root for license information.
using System;
using Microsoft.AspNetCore.Razor.LanguageServer.RazorLS;
using Microsoft.CodeAnalysis.Text;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.LanguageServer.Protocol;
@ -77,7 +76,7 @@ internal static class PositionExtensions
{
#pragma warning disable CA2254 // Template should be a static expression.
// This is actually static, the compiler just doesn't know it.
logger?.LogError(Resources.GetResourceString("FormatPositionIndex_Outside_Range"), line, nameof(sourceText), sourceText.Lines.Count);
logger?.LogError(SR.FormatPositionIndex_Outside_Range(line, nameof(sourceText), sourceText.Lines.Count));
#pragma warning restore CA2254 // Template should be a static expression
absoluteIndex = -1;
return false;

Просмотреть файл

@ -54,7 +54,7 @@ internal static class TextLineExtensions
{
if (startOffset > line.SpanIncludingLineBreak.Length)
{
throw new ArgumentOutOfRangeException(nameof(startOffset), RazorLS.Resources.Invalid_Offset);
throw new ArgumentOutOfRangeException(nameof(startOffset), SR.Invalid_Offset);
}
return line.Text!.GetFirstNonWhitespaceOffset(TextSpan.FromBounds(line.Start + startOffset, line.EndIncludingLineBreak), out _);

Просмотреть файл

@ -34,4 +34,14 @@
<ProjectReference Include="..\Microsoft.AspNetCore.Razor.LanguageServer.Common\Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj" />
<ProjectReference Include="..\Microsoft.AspNetCore.Razor.LanguageServer.Protocol\Microsoft.AspNetCore.Razor.LanguageServer.Protocol.csproj" />
</ItemGroup>
<ItemGroup Label="String Resources">
<EmbeddedResource Update="Resources\SR.resx">
<GenerateSource>true</GenerateSource>
<Namespace>$(ProjectName).Resources</Namespace>
</EmbeddedResource>
<Using Include="$(ProjectName).Resources" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="cs" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="cs" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="de" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="de" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="es" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="es" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="fr" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="fr" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="it" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="it" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ja" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="ja" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ko" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="ko" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pl" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="pl" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pt-BR" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="pt-BR" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ru" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="ru" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="tr" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="tr" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../RazorLS.Resources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../SR.resx">
<body>
<trans-unit id="Blazor_directive_attributes">
<source>Blazor directive attributes</source>

Просмотреть файл

@ -186,7 +186,7 @@ internal class TagHelperSemanticRangeVisitor : SyntaxWalker
}
else
{
throw new NotSupportedException(RazorLS.Resources.Unknown_RazorMetaCode);
throw new NotSupportedException(SR.Unknown_RazorMetaCode);
}
}

Просмотреть файл

@ -19,12 +19,12 @@ internal class DefaultVSLSPTagHelperTooltipFactory : VSLSPTagHelperTooltipFactor
// Internal for testing
internal static readonly ImageElement ClassGlyph = new(
new ImageId(s_imageCatalogGuid, 463), // KnownImageIds.Type = 463
RazorLS.Resources.TagHelper_Element_Glyph);
SR.TagHelper_Element_Glyph);
// Internal for testing
internal static readonly ImageElement PropertyGlyph = new(
new ImageId(s_imageCatalogGuid, 2429), // KnownImageIds.Type = 2429
RazorLS.Resources.TagHelper_Attribute_Glyph);
SR.TagHelper_Attribute_Glyph);
private static readonly IReadOnlyList<string> s_cSharpPrimitiveTypes =
new string[] { "bool", "byte", "sbyte", "char", "decimal", "double", "float", "int", "uint",

Просмотреть файл

@ -10,7 +10,6 @@ using System.Linq;
using Microsoft.AspNetCore.Razor.Language;
using Microsoft.AspNetCore.Razor.Language.Legacy;
using Microsoft.AspNetCore.Razor.Language.Syntax;
using Resources = Microsoft.CodeAnalysis.Razor.Workspaces.Resources;
namespace Microsoft.CodeAnalysis.Razor.Completion;
@ -158,7 +157,7 @@ internal class DirectiveCompletionItemProvider : RazorCompletionItemProvider
var snippetDescription = "@" + snippetTexts.DisplayText
+ Environment.NewLine
+ Resources.DirectiveSnippetDescription;
+ SR.DirectiveSnippetDescription;
snippetCompletionItem.SetDirectiveCompletionDescription(new(snippetDescription));
completionItems.Add(snippetCompletionItem);

Просмотреть файл

@ -24,4 +24,13 @@
<ProjectReference Include="..\Microsoft.AspNetCore.Razor.Common\Microsoft.AspNetCore.Razor.Common.csproj" />
</ItemGroup>
<ItemGroup Label="String Resources">
<EmbeddedResource Update="Resources\SR.resx">
<GenerateSource>true</GenerateSource>
<Namespace>$(ProjectName).Resources</Namespace>
</EmbeddedResource>
<Using Include="$(ProjectName).Resources" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="cs" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="cs" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="de" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="de" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="es" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="es" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="fr" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="fr" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="it" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="it" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ja" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="ja" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ko" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="ko" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pl" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="pl" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pt-BR" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="pt-BR" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ru" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="ru" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="tr" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="tr" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -58,7 +58,7 @@ internal class DefaultVisualStudioDocumentTracker : VisualStudioDocumentTracker
if (string.IsNullOrEmpty(filePath))
{
throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(filePath));
throw new ArgumentException(SR.ArgumentCannotBeNullOrEmpty, nameof(filePath));
}
if (projectPath is null)

Просмотреть файл

@ -24,4 +24,13 @@
<ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor.Workspaces\Microsoft.CodeAnalysis.Razor.Workspaces.csproj" />
</ItemGroup>
<ItemGroup Label="String Resources">
<EmbeddedResource Update="Resources\SR.resx">
<GenerateSource>true</GenerateSource>
<Namespace>$(ProjectName).Resources</Namespace>
</EmbeddedResource>
<Using Include="$(ProjectName).Resources" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="cs" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="cs" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="de" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="de" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="es" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="es" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="fr" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="fr" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="it" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="it" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ja" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="ja" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ko" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="ko" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pl" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="pl" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pt-BR" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="pt-BR" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ru" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="ru" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="tr" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="tr" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../Resources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../SR.resx">
<body>
<trans-unit id="ArgumentCannotBeNullOrEmpty">
<source>Value cannot be null or an empty string.</source>

Просмотреть файл

@ -22,17 +22,17 @@ internal class TextSnapshotProjectItem : RazorProjectItem
if (string.IsNullOrEmpty(projectDirectory))
{
throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(projectDirectory));
throw new ArgumentException(SR.ArgumentCannotBeNullOrEmpty, nameof(projectDirectory));
}
if (string.IsNullOrEmpty(relativeFilePath))
{
throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(relativeFilePath));
throw new ArgumentException(SR.ArgumentCannotBeNullOrEmpty, nameof(relativeFilePath));
}
if (string.IsNullOrEmpty(filePath))
{
throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(filePath));
throw new ArgumentException(SR.ArgumentCannotBeNullOrEmpty, nameof(filePath));
}
if (fileKind is null)

Просмотреть файл

@ -2,10 +2,10 @@
// Licensed under the MIT license. See License.txt in the project root for license information.
using System;
using Microsoft.AspNetCore.Razor.LanguageServer.RazorLS;
using Microsoft.CodeAnalysis.Text;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.LanguageServer.Protocol;
using LanguageServerSR = Microsoft.AspNetCore.Razor.LanguageServer.Resources.SR;
namespace Microsoft.VisualStudio.LanguageServerClient.Razor.Extensions;
@ -28,9 +28,10 @@ internal static class PositionExtensions
{
#pragma warning disable CA2254 // Template should be a static expression
// Resources.GetResourceString won't vary, so this is fine
logger?.LogError(Resources.GetResourceString("FormatPositionIndex_Outside_Range"), position.Line,
logger?.LogError(LanguageServerSR.FormatPositionIndex_Outside_Range(
position.Line,
nameof(sourceText),
sourceText.Lines.Count);
sourceText.Lines.Count));
#pragma warning restore CA2254 // Template should be a static expression
absoluteIndex = -1;
return false;

Просмотреть файл

@ -106,7 +106,7 @@ internal class RazorHtmlCSharpLanguageServerClient : ILanguageClient, IDisposabl
{
var initializationFailureContext = new InitializationFailureContext
{
FailureMessage = string.Format(VS.LSClientRazor.Resources.LanguageServer_Initialization_Failed,
FailureMessage = string.Format(SR.LanguageServer_Initialization_Failed,
Name, initializationState.StatusMessage, initializationState.InitializationException?.ToString())
};
return Task.FromResult<InitializationFailureContext?>(initializationFailureContext);

Просмотреть файл

@ -36,4 +36,13 @@
<PackageReference Include="Microsoft.VisualStudio.RpcContracts" Version="$(MicrosoftVisualStudioRpcContractsPackageVersion)" />
</ItemGroup>
<ItemGroup Label="String Resources">
<EmbeddedResource Update="Resources\SR.resx">
<GenerateSource>true</GenerateSource>
<Namespace>$(ProjectName).Resources</Namespace>
</EmbeddedResource>
<Using Include="$(ProjectName).Resources" />
</ItemGroup>
</Project>

Просмотреть файл

@ -232,7 +232,7 @@ internal class RazorLanguageServerClient : ILanguageClient, ILanguageClientCusto
{
var initializationFailureContext = new InitializationFailureContext
{
FailureMessage = string.Format(VS.LSClientRazor.Resources.LanguageServer_Initialization_Failed,
FailureMessage = string.Format(SR.LanguageServer_Initialization_Failed,
Name, initializationState.StatusMessage, initializationState.InitializationException?.ToString())
};
return Task.FromResult<InitializationFailureContext?>(initializationFailureContext);

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="cs" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="cs" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="de" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="de" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="es" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="es" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="fr" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="fr" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="it" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="it" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ja" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="ja" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ko" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="ko" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pl" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="pl" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="pt-BR" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="pt-BR" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="ru" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="ru" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="tr" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="tr" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hans" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../VS.LSClientRazor.Resources.resx">
<file datatype="xml" source-language="en" target-language="zh-Hant" original="../SR.resx">
<body>
<trans-unit id="LanguageServer_Initialization_Failed">
<source>{0} failed to initialize. Please report a problem via Help -&gt; Send Feedback -&gt; Report a Problem. Status = {1}. Exception = {2}</source>

Просмотреть файл

@ -15,7 +15,6 @@ using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
using Microsoft.VisualStudio.Threading;
using Microsoft.VisualStudio.Utilities;
using Resources = Microsoft.VisualStudio.LanguageServerClient.Razor.VS.LSClientRazor.Resources;
namespace Microsoft.VisualStudio.LanguageServerClient.Razor;
@ -31,7 +30,7 @@ internal sealed class ViewCodeCommandHandler : ICommandHandler<ViewCodeCommandAr
private static readonly ImmutableHashSet<string> s_relatedRazorFileSuffixes = ImmutableHashSet.CreateRange(StringComparer.OrdinalIgnoreCase, new[] { RazorLSPConstants.CSHTMLFileExtension, RazorLSPConstants.RazorFileExtension });
private static readonly CommandState s_availableCommandState = new(isAvailable: true, displayText: Resources.View_Code);
private static readonly CommandState s_availableCommandState = new(isAvailable: true, displayText: SR.View_Code);
private readonly DocumentInteractionManager _documentInteractionManager;
private readonly ITextDocumentFactoryService _textDocumentFactoryService;
private readonly JoinableTaskContext _joinableTaskContext;

Просмотреть файл

@ -4,11 +4,11 @@
using System;
using Microsoft.VisualStudio.Editor;
using Microsoft.VisualStudio.Editor.Razor.Debugging;
using Microsoft.VisualStudio.LanguageServices.Razor.Extensions;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.TextManager.Interop;
using Microsoft.VisualStudio.Threading;
using Microsoft.VisualStudio.Utilities;
using Microsoft.VisualStudio.LanguageServices.Razor.Extensions;
using TextSpan = Microsoft.VisualStudio.TextManager.Interop.TextSpan;
namespace Microsoft.VisualStudio.LanguageServices.Razor;
@ -79,8 +79,8 @@ internal partial class RazorLanguageService : IVsLanguageDebugInfo
}
var proximityExpressions = _uiThreadOperationExecutor.Execute(
title: Resources.ProximityExpression_Dialog_Title,
description: Resources.ProximityExpression_Dialog_Description,
title: SR.ProximityExpression_Dialog_Title,
description: SR.ProximityExpression_Dialog_Description,
allowCancellation: true,
showProgress: true,
(cancellationToken) => _proximityExpressionResolver.TryResolveProximityExpressionsAsync(textBuffer, iLine, iCol, cancellationToken), _joinableTaskFactory);

Просмотреть файл

@ -36,7 +36,7 @@ internal class VisualStudioFileChangeTracker : FileChangeTracker, IVsFreeThreade
{
if (string.IsNullOrEmpty(filePath))
{
throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(filePath));
throw new ArgumentException(SR.ArgumentCannotBeNullOrEmpty, nameof(filePath));
}
if (errorReporter is null)

Просмотреть файл

@ -51,7 +51,7 @@ internal class VisualStudioFileChangeTrackerFactory : FileChangeTrackerFactory
{
if (string.IsNullOrEmpty(filePath))
{
throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(filePath));
throw new ArgumentException(SR.ArgumentCannotBeNullOrEmpty, nameof(filePath));
}
var fileChangeTracker = new VisualStudioFileChangeTracker(filePath, _errorReporter, _fileChangeService, _projectSnapshotManagerDispatcher, _joinableTaskContext);

Просмотреть файл

@ -34,6 +34,15 @@
<Reference Include="System.Xaml" />
</ItemGroup>
<ItemGroup Label="String Resources">
<EmbeddedResource Update="Resources\SR.resx">
<GenerateSource>true</GenerateSource>
<Namespace>$(ProjectName).Resources</Namespace>
</EmbeddedResource>
<Using Include="$(ProjectName).Resources" />
</ItemGroup>
<!--
The ProjectSystem.SDK tasks that handle XamlPropertyRule don't work on the dotnet core version
of MSBuild. The workaround here is to only hardcode the generated code location such that it gets

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше