Skip to content

Commit

Permalink
Revert "Move SymbolSearch down to EditorFeatures (dotnet#45505)"
Browse files Browse the repository at this point in the history
This reverts commit f755e8a. That
change meant our EditorFeatures code was using DllImports in the
cross-platform binary, and we weren't sure what that would do in
VS for Mac if that code ran. It also brought a dependency on
Microsoft.VisualStudio.RemoteControl, which also seems to depend on
various Windows specific APIs.

We'll finish up the decision of what to do in
dotnet#45115
  • Loading branch information
jasonmalinowski committed Jun 29, 2020
1 parent 560cdb5 commit 5d7dc2f
Show file tree
Hide file tree
Showing 46 changed files with 215 additions and 210 deletions.
9 changes: 9 additions & 0 deletions src/EditorFeatures/Core.Wpf/EditorFeaturesWpfResources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Downloading_index_failed" xml:space="preserve">
<value>Downloading index failed</value>
</data>
<data name="Downloading_index_failed_0" xml:space="preserve">
<value>Downloading index failed:{0}</value>
</data>
<data name="Downloading_IntelliSense_index_for_0" xml:space="preserve">
<value>Downloading IntelliSense index for {0}</value>
</data>
<data name="Regex_Comment" xml:space="preserve">
<value>Regex - Comment</value>
</data>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" Version="$(MicrosoftVisualStudioLanguageStandardClassificationVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(MicrosoftVisualStudioLanguageIntellisenseVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="$(MicrosoftVisualStudioTextUIWpfVersion)" />
<PackageReference Include="Microsoft.VisualStudio.RemoteControl" Version="$(MicrosoftVisualStudioRemoteControlVersion)" />
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="$(MicrosoftVisualStudioSDKEmbedInteropTypesVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
// 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.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Elfie.Model;

namespace Microsoft.CodeAnalysis.SymbolSearch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ private async Task<TimeSpan> DownloadFullDatabaseAsync(FileInfo databaseFileInfo
{
try
{
var title = string.Format(EditorFeaturesResources.Downloading_IntelliSense_index_for_0, _source);
var title = string.Format(EditorFeaturesWpfResources.Downloading_IntelliSense_index_for_0, _source);
await _service._progressService.OnDownloadFullDatabaseStartedAsync(title).ConfigureAwait(false);

var (succeeded, delay) = await DownloadFullDatabaseWorkerAsync(databaseFileInfo, cancellationToken).ConfigureAwait(false);
Expand All @@ -243,7 +243,7 @@ private async Task<TimeSpan> DownloadFullDatabaseAsync(FileInfo databaseFileInfo
else
{
await _service._progressService.OnDownloadFullDatabaseFailedAsync(
EditorFeaturesResources.Downloading_index_failed).ConfigureAwait(false);
EditorFeaturesWpfResources.Downloading_index_failed).ConfigureAwait(false);
}

return delay;
Expand All @@ -256,9 +256,8 @@ await _service._progressService.OnDownloadFullDatabaseFailedAsync(
catch (Exception e)
{
var message = string.Format(
EditorFeaturesResources.Downloading_index_failed_0,
Environment.NewLine + e.ToString());

EditorFeaturesWpfResources.Downloading_index_failed_0,
"\r\n" + e.ToString());
await _service._progressService.OnDownloadFullDatabaseFailedAsync(message).ConfigureAwait(false);
throw;
}
Expand Down
15 changes: 15 additions & 0 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Index se nepodařilo stáhnout.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Index se nepodařilo stáhnout: {0}.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Stahuje se index IntelliSense pro {0}.</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Shromažďují se návrhy – {0}.</target>
Expand Down
15 changes: 15 additions & 0 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Fehler beim Herunterladen des Index.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Fehler beim Herunterladen von Index: {0}.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Der IntelliSense-Index für "{0}" wird heruntergeladen.</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Vorschläge werden gesammelt: "{0}"</target>
Expand Down
15 changes: 15 additions & 0 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Error al descargar el índice.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Error al descargar el índice: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Descargando el índice de IntelliSense para {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Recopilando sugerencias: "{0}"</target>
Expand Down
15 changes: 15 additions & 0 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Échec du téléchargement de l'index</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Échec du téléchargement de l'index : {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Téléchargement de l'index IntelliSense pour {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Collecte des suggestions - '{0}'</target>
Expand Down
15 changes: 15 additions & 0 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Il download dell'indice non è riuscito</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Il download dell'indice non è riuscito: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Download dell'indice IntelliSense per {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Raccolta dei suggerimenti - '{0}'</target>
Expand Down
15 changes: 15 additions & 0 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">インデックスのダウンロードに失敗しました</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">インデックスのダウンロードに失敗しました: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">{0} の IntelliSense インデックスをダウンロードしています</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">提案を収集しています - '{0}'</target>
Expand Down
15 changes: 15 additions & 0 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">인덱스를 다운로드하지 못했습니다.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">인덱스 다운로드 실패:{0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">{0}의 IntelliSense 인덱스 다운로드 중</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">제안을 수집하는 중 - '{0}'</target>
Expand Down
15 changes: 15 additions & 0 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Pobieranie indeksu nie powiodło się</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Pobieranie indeksu nie powiodło się: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Pobieranie indeksu funkcji IntelliSense dla {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Zbieranie sugestii — „{0}”</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Falha ao baixar o índice</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Falha ao baixar o índice:{0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Baixando o índice do IntelliSense para {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Obtendo Sugestões – '{0}'</target>
Expand Down
15 changes: 15 additions & 0 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Не удалось скачать индекс.</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Ошибка при скачивании индекса: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">Загрузка индекса IntelliSense для {0}</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Сбор предложений — "{0}"</target>
Expand Down
15 changes: 15 additions & 0 deletions src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.tr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">Dizin indirilemedi</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">Dizin indirilemedi: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">{0} için IntelliSense dizini indiriliyor</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">Öneriler Toplanıyor - '{0}'</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">下载索引失败</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">下载索引失败: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">正在下载用于 {0} 的 IntelliSense 索引</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">正在收集建议 -“{0}”</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<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="../EditorFeaturesWpfResources.resx">
<body>
<trans-unit id="Downloading_index_failed">
<source>Downloading index failed</source>
<target state="translated">下載索引失敗</target>
<note />
</trans-unit>
<trans-unit id="Downloading_index_failed_0">
<source>Downloading index failed:{0}</source>
<target state="translated">下載索引失敗: {0}</target>
<note />
</trans-unit>
<trans-unit id="Downloading_IntelliSense_index_for_0">
<source>Downloading IntelliSense index for {0}</source>
<target state="translated">正在為 {0} 下載 IntelliSense 索引</target>
<note />
</trans-unit>
<trans-unit id="Gathering_Suggestions_0">
<source>Gathering Suggestions - '{0}'</source>
<target state="translated">正在蒐集建議 - '{0}'</target>
Expand Down
Loading

0 comments on commit 5d7dc2f

Please sign in to comment.