diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md index 64097a040a..c13105bd5b 100644 --- a/Extension/CHANGELOG.md +++ b/Extension/CHANGELOG.md @@ -1,5 +1,9 @@ # C/C++ for Visual Studio Code Change Log +## Version 1.6.0-insiders3: August 18, 2021 +### Bug Fixes +* Fix insiders update install loop for remote scenarios. [#8000](https://github.com/microsoft/vscode-cpptools/issues/8000) + ## Version 1.6.0-insiders2: August 17, 2021 ### Bug Fixes * Fix issues with overlapping code folding ranges. [#7809](https://github.com/microsoft/vscode-cpptools/issues/7809) diff --git a/Extension/i18n/chs/package.i18n.json b/Extension/i18n/chs/package.i18n.json index c287f5fa07..2628188b04 100644 --- a/Extension/i18n/chs/package.i18n.json +++ b/Extension/i18n/chs/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "配置格式化引擎", "c_cpp.configuration.formatting.clangFormat.description": "将使用 clang-format 设置代码的格式。", "c_cpp.configuration.formatting.vcFormat.description": "将使用 Visual C++ 格式设置引擎来设置代码的格式。", - "c_cpp.configuration.formatting.Default.description": "将使用 clang-format 设置代码的格式。", + "c_cpp.configuration.formatting.Default.description": "默认情况下，clang-format 将用于设置代码格式。但如果找到更接近要设置格式代码的具有相关设置的 .editorconfig 文件，并且 clang_format_style 为默认值 “file”，则将使用 Visual C++ 格式设置引擎。", "c_cpp.configuration.formatting.Disabled.description": "将禁用代码格式设置。", "c_cpp.configuration.vcFormat.indent.braces.description": "按照在“编辑器: 制表符大小”设置中指定的量缩进大括号。", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "确定新行缩进的基准", diff --git a/Extension/i18n/chs/src/LanguageServer/settings.i18n.json b/Extension/i18n/chs/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..35d30bb5b2 --- /dev/null +++ b/Extension/i18n/chs/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "代码格式设置使用 .editorconfig 中的设置，而不是 .clang-format。有关详细信息，请参阅 “C_Cpp.formatting” 设置的“默认”值的文档。" +} \ No newline at end of file diff --git a/Extension/i18n/cht/package.i18n.json b/Extension/i18n/cht/package.i18n.json index faaf64396a..95864e0db8 100644 --- a/Extension/i18n/cht/package.i18n.json +++ b/Extension/i18n/cht/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "選擇格式設定引擎", "c_cpp.configuration.formatting.clangFormat.description": "將使用 clang-format 來格式化程式碼。", "c_cpp.configuration.formatting.vcFormat.description": "將使用 Visual C++ 格式化引擎來格式化程式碼。", - "c_cpp.configuration.formatting.Default.description": "將使用 clang-format 來格式化程式碼。", + "c_cpp.configuration.formatting.Default.description": "根據預設，會使用 clang 格式將程式碼格式化。不過，如果具有相關設定之 .editorconfig 檔案更接近要格式化的程式碼，且 clang_format_style 為預設值 'file'，則將會使用 Visual C++ 格式引擎。", "c_cpp.configuration.formatting.Disabled.description": "將停用程式碼格式化。", "c_cpp.configuration.vcFormat.indent.braces.description": "大括弧會依據 [Editor: Tab Size] 設定中指定的數量縮排。", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "決定換行縮排相對於", diff --git a/Extension/i18n/cht/src/LanguageServer/settings.i18n.json b/Extension/i18n/cht/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..f291f9ab83 --- /dev/null +++ b/Extension/i18n/cht/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "程式碼格式設定使用來自 .editorconfig 的設定，而不是 .clang 格式。如需詳細資訊，請參閱 'C_Cpp.formatting' 設定之 'Default' 值的文件。" +} \ No newline at end of file diff --git a/Extension/i18n/csy/package.i18n.json b/Extension/i18n/csy/package.i18n.json index 4ed61a342e..7e3cf6c9ff 100644 --- a/Extension/i18n/csy/package.i18n.json +++ b/Extension/i18n/csy/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "Nakonfiguruje nástroj formátování textu.", "c_cpp.configuration.formatting.clangFormat.description": "K formátování kódu se použije clang-format.", "c_cpp.configuration.formatting.vcFormat.description": "K formátování kódu se použije nástroj formátování textu Visual C++.", - "c_cpp.configuration.formatting.Default.description": "K formátování kódu se použije clang-format.", + "c_cpp.configuration.formatting.Default.description": "Ve výchozím nastavení se k formátování kódu použije clang-format. Pokud se ale blíže k formátovanému kódu najde soubor .editorconfig s relevantními nastaveními a clang_format_style bude mít výchozí hodnotu file, použije se modul formátování Visual C++.", "c_cpp.configuration.formatting.Disabled.description": "Formátování kódu bude zakázané.", "c_cpp.configuration.vcFormat.indent.braces.description": "Složené závorky se odsazují mezerou zadanou v nastavení Editor: Velikost tabulátoru.", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "Určuje, k čemu bude relativní odsazení nových řádků.", diff --git a/Extension/i18n/csy/src/LanguageServer/settings.i18n.json b/Extension/i18n/csy/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..afc0f1c7fc --- /dev/null +++ b/Extension/i18n/csy/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "Formátování kódu používá nastavení z .editorconfig namísto .clang-format. Další informace najdete v dokumentaci k hodnotě Default v nastavení C_Cpp.formatting." +} \ No newline at end of file diff --git a/Extension/i18n/deu/package.i18n.json b/Extension/i18n/deu/package.i18n.json index c47ee08ef6..22fd90c973 100644 --- a/Extension/i18n/deu/package.i18n.json +++ b/Extension/i18n/deu/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "Konfiguriert das Formatierungsmodul.", "c_cpp.configuration.formatting.clangFormat.description": "Zum Formatieren von Code wird \"clang-format\" verwendet.", "c_cpp.configuration.formatting.vcFormat.description": "Das Visual C++-Formatierungsmodul wird zum Formatieren von Code verwendet.", - "c_cpp.configuration.formatting.Default.description": "Zum Formatieren von Code wird \"clang-format\" verwendet.", + "c_cpp.configuration.formatting.Default.description": "Standardmäßig wird „clang-format“ zum Formatieren des Codes verwendet. Das Visual C++-Formatierungsmodul wird jedoch verwendet, wenn eine „.editorconfig“-Datei mit relevanten Einstellungen näher am zu formatierenden Code gefunden wird und „clang_format_style“ folgender Standardwert ist: „file“.", "c_cpp.configuration.formatting.Disabled.description": "Die Codeformatierung wird deaktiviert.", "c_cpp.configuration.vcFormat.indent.braces.description": "Geschweifte Klammern werden um den im Editor in der Einstellung für die Tabstoppgröße angegebenen Wert eingerückt.", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "Legt den Bezugspunkt für den neuen Zeileneinzug fest.", diff --git a/Extension/i18n/deu/src/LanguageServer/settings.i18n.json b/Extension/i18n/deu/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..576615c827 --- /dev/null +++ b/Extension/i18n/deu/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "Die Codeformatierung verwendet die Einstellungen von „.editorconfig“ anstelle von „.clang-format“. Weitere Informationen finden Sie in der Dokumentation zum „Default“-Wert der Einstellung „C_Cpp.formatting“." +} \ No newline at end of file diff --git a/Extension/i18n/esn/package.i18n.json b/Extension/i18n/esn/package.i18n.json index 375973fda7..6ea6782c1a 100644 --- a/Extension/i18n/esn/package.i18n.json +++ b/Extension/i18n/esn/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "Configura el motor de formato", "c_cpp.configuration.formatting.clangFormat.description": "El archivo clang-format se usará para formatear el código.", "c_cpp.configuration.formatting.vcFormat.description": "El motor de formato de Visual C++ se usará para formatear el código.", - "c_cpp.configuration.formatting.Default.description": "El archivo clang-format se usará para formatear el código.", + "c_cpp.configuration.formatting.Default.description": "De forma predeterminada, se utilizará clang-format para dar formato al código. Sin embargo, se utilizará el motor de formato de Visual C++ si un archivo .editorconfig con la configuración relevante se encuentra más cerca del código que se va a formatear y clang_format_style es el valor predeterminado: \"file\".", "c_cpp.configuration.formatting.Disabled.description": "El formato del código se deshabilitará.", "c_cpp.configuration.vcFormat.indent.braces.description": "Se aplica a las llaves la sangría especificada en la configuración de Editor: Tamaño de tabulación.", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "Determina en relación con qué se aplica la sangría de línea nueva.", @@ -171,7 +171,7 @@ "c_cpp.configuration.addNodeAddonIncludePaths.description": "Agregue rutas de acceso de inclusión de nan y node-addon-api cuando sean dependencias.", "c_cpp.configuration.renameRequiresIdentifier.description": "Si es true, \"Cambiar el nombre del símbolo\" requerirá un identificador de C/C++ válido.", "c_cpp.configuration.autocompleteAddParentheses.description": "Si es true, la opción de autocompletar agregará \"(\" de forma automática después de las llamadas a funciones, en cuyo caso puede que también se agregue \")\", en función del valor de la configuración de \"editor.autoClosingBrackets\".", - "c_cpp.configuration.filesExclude.description": "Configure patrones globales para excluir carpetas (y archivos si se cambia \"C_Cpp.exclusionPolicy\"). Estos son específicos de la extensión de C/C++ y se agregan a \"files.Exclude\", pero a diferencia de \"files.Exclude\" no se quitan de la vista del explorador. Más información acerca de los patrones de globales [aquí](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options).", + "c_cpp.configuration.filesExclude.description": "Configure patrones globales para excluir carpetas (y archivos si se cambia \"C_Cpp.exclusionPolicy\"). Estos son específicos de la extensión de C/C++ y se agregan a \"files.exclude\", pero a diferencia de \"files.exclude\" no se quitan de la vista del explorador. Más información acerca de los patrones de globales [aquí](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options).", "c_cpp.configuration.filesExcludeBoolean.description": "El patrón global con el que se harán coincidir las rutas de acceso de los archivos. Establézcalo en true o false para habilitarlo o deshabilitarlo.", "c_cpp.configuration.filesExcludeWhen.description": "Comprobación adicional de los elementos del mismo nivel de un archivo coincidente. Use $(nombreBase) como variable para el nombre de archivo que coincide.", "c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "Si es true, la sustitución de comandos del shell del depurador usará la marca de comilla simple (') obsoleta.", diff --git a/Extension/i18n/esn/src/LanguageServer/settings.i18n.json b/Extension/i18n/esn/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..cc5a9101b4 --- /dev/null +++ b/Extension/i18n/esn/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "El formato de código está usando la configuración de .editorconfig en lugar de .clang-format. Para obtener más información, consulte la documentación para el valor \"default\" de la configuración \"C_Cpp.formatting\"." +} \ No newline at end of file diff --git a/Extension/i18n/fra/package.i18n.json b/Extension/i18n/fra/package.i18n.json index 0d00fd133c..1340a12f97 100644 --- a/Extension/i18n/fra/package.i18n.json +++ b/Extension/i18n/fra/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "Configure le moteur de mise en forme", "c_cpp.configuration.formatting.clangFormat.description": "clang-format est utilisé pour la mise en forme du code.", "c_cpp.configuration.formatting.vcFormat.description": "Le moteur de mise en forme de Visual C++ est utilisé pour la mise en forme du code.", - "c_cpp.configuration.formatting.Default.description": "clang-format est utilisé pour la mise en forme du code.", + "c_cpp.configuration.formatting.Default.description": "Par défaut, clang-format sera utilisé pour formater le code. Cependant, le moteur de formatage Visual C++ sera utilisé si un fichier .editorconfig avec des paramètres pertinents est trouvé plus près du code à formater et si clang_format_style a la valeur par défaut : 'file'.", "c_cpp.configuration.formatting.Disabled.description": "La mise en forme du code va être désactivée.", "c_cpp.configuration.vcFormat.indent.braces.description": "Les accolades sont mises en retrait en fonction de la valeur spécifiée dans le paramètre Éditeur : Taille des tabulations.", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "Détermine par rapport à quoi la nouvelle ligne est mise en retrait", diff --git a/Extension/i18n/fra/src/LanguageServer/settings.i18n.json b/Extension/i18n/fra/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..a8023d1c19 --- /dev/null +++ b/Extension/i18n/fra/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "Le formatage du code utilise les paramètres de .editorconfig au lieu de .clang-format. Pour plus d'informations, consultez la documentation relative à la valeur \"par défaut\" du paramètre \"C_Cpp.formatting\"." +} \ No newline at end of file diff --git a/Extension/i18n/ita/package.i18n.json b/Extension/i18n/ita/package.i18n.json index 0a65f40f78..fbb20cd04e 100644 --- a/Extension/i18n/ita/package.i18n.json +++ b/Extension/i18n/ita/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "Configura il motore di formattazione", "c_cpp.configuration.formatting.clangFormat.description": "Per formattare il codice, verrà usato clang-format.", "c_cpp.configuration.formatting.vcFormat.description": "Per formattare il codice, verrà usato il motore di formattazione Visual C++.", - "c_cpp.configuration.formatting.Default.description": "Per formattare il codice, verrà usato clang-format.", + "c_cpp.configuration.formatting.Default.description": "Per impostazione predefinita, per formattare il codice verrà usato clang-format. Verrà tuttavia usato il motore di formattazione di Visual C++ se viene trovato un file con estensione editorconfig con impostazioni pertinenti in una posizione più vicina al codice da formattare e clang_format_style è impostato sul valore predefinito 'file'.", "c_cpp.configuration.formatting.Disabled.description": "La formattazione del codice verrà disabilitata.", "c_cpp.configuration.vcFormat.indent.braces.description": "Le parentesi graffe vengono rientrate in base al valore specificato nell'impostazione Editor: Dimensione tabulazione.", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "Determina l'elemento rispetto al quale viene impostato il rientro della nuova riga", diff --git a/Extension/i18n/ita/src/LanguageServer/settings.i18n.json b/Extension/i18n/ita/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..b16ce664a3 --- /dev/null +++ b/Extension/i18n/ita/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "Per la formattazione del codice vengono usate le impostazioni del file con estensione editorconfig invece di quello con estensione clang-format. Per altre informazioni, vedere la documentazione relativa al valore `Default` dell'impostazione 'C_Cpp.formatting'." +} \ No newline at end of file diff --git a/Extension/i18n/jpn/package.i18n.json b/Extension/i18n/jpn/package.i18n.json index c0e0acb9d0..eeb3adb140 100644 --- a/Extension/i18n/jpn/package.i18n.json +++ b/Extension/i18n/jpn/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "書式設定エンジンを構成します", "c_cpp.configuration.formatting.clangFormat.description": "clang-format を使用してコードがフォーマットされます。", "c_cpp.configuration.formatting.vcFormat.description": "コードの書式設定に Visual C++ の書式設定エンジンが使用されます。", - "c_cpp.configuration.formatting.Default.description": "clang-format を使用してコードがフォーマットされます。", + "c_cpp.configuration.formatting.Default.description": "既定では、clang-format を使用してコードをフォーマットします。ただし、関連する設定を持つ .editorconfig ファイルがフォーマット対象のコードの近くに見つかり、clang_format_style が既定値である場合は、Visual C++ フォーマット エンジンが使用されます: 'file'。", "c_cpp.configuration.formatting.Disabled.description": "コードの書式設定は無効になります。", "c_cpp.configuration.vcFormat.indent.braces.description": "中かっこは、[Editor: Tab Size](エディター: タブ サイズ) 設定で指定された分だけインデントされます。", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "新しい行のインデントの基準を決定します", diff --git a/Extension/i18n/jpn/src/LanguageServer/settings.i18n.json b/Extension/i18n/jpn/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..ca3a87f893 --- /dev/null +++ b/Extension/i18n/jpn/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "コードのフォーマットでは、.clang-format ではなく .editorconfig の設定を使用しています。詳細については、'C_Cpp.formatting' 設定の 'Default' 値に関するドキュメントを参照してください。" +} \ No newline at end of file diff --git a/Extension/i18n/kor/package.i18n.json b/Extension/i18n/kor/package.i18n.json index ad4b6f73b9..945c492e60 100644 --- a/Extension/i18n/kor/package.i18n.json +++ b/Extension/i18n/kor/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "서식 엔진을 구성합니다.", "c_cpp.configuration.formatting.clangFormat.description": "코드 서식을 지정하는 데 clang-format이 사용됩니다.", "c_cpp.configuration.formatting.vcFormat.description": "코드 서식을 지정하는 데 Visual C++ 서식 엔진이 사용됩니다.", - "c_cpp.configuration.formatting.Default.description": "코드 서식을 지정하는 데 clang-format이 사용됩니다.", + "c_cpp.configuration.formatting.Default.description": "기본적으로 clang 형식이 코드 형식에 사용되지만 관련 설정을 가진 .editorconfig 파일이 포맷 중인 코드에 가까이 있고 clang_format_style이 기본값인 'file'인 경우 Visual C++ 형식 지정 엔진이 사용됩니다.", "c_cpp.configuration.formatting.Disabled.description": "코드 서식을 사용하지 않도록 설정됩니다.", "c_cpp.configuration.vcFormat.indent.braces.description": "편집기: 탭 크기 설정에 지정된 수만큼 중괄호를 들여씁니다.", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "새 줄 들여쓰기의 기준을 결정합니다.", diff --git a/Extension/i18n/kor/src/LanguageServer/settings.i18n.json b/Extension/i18n/kor/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..ff4d9e7dea --- /dev/null +++ b/Extension/i18n/kor/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "코드 형식이 .clang 형식 대신 .editorconfig의 설정을 사용합니다. 자세한 내용은 'C_Cpp.formatting' 설정의 'Default' 값에 대한 설명서를 참조하세요." +} \ No newline at end of file diff --git a/Extension/i18n/plk/package.i18n.json b/Extension/i18n/plk/package.i18n.json index 8bd959f14e..2a196e9182 100644 --- a/Extension/i18n/plk/package.i18n.json +++ b/Extension/i18n/plk/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "Konfiguruje aparat formatowania", "c_cpp.configuration.formatting.clangFormat.description": "Do formatowania kodu będzie używane narzędzie clang-format.", "c_cpp.configuration.formatting.vcFormat.description": "Do formatowania kodu będzie używany aparat formatowania języka Visual C++.", - "c_cpp.configuration.formatting.Default.description": "Do formatowania kodu będzie używane narzędzie clang-format.", + "c_cpp.configuration.formatting.Default.description": "Domyślnie do formatowania kodu zostanie użyty format Clang. Niemniej jednak aparat formatowania Visual C++ będzie używany, jeśli plik .editorconfig z odpowiednimi ustawieniami zostanie znaleziony bliżej formatowanego kodu, a clang_format_style jest wartością domyślną: „file”.", "c_cpp.configuration.formatting.Disabled.description": "Formatowanie kodu zostanie wyłączone.", "c_cpp.configuration.vcFormat.indent.braces.description": "Dla nawiasów klamrowych jest stosowane wcięcie według liczby określonej w ustawieniu Edytor: rozmiar tabulatora.", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "Określa element, względem którego jest ustalane wcięcie nowego wiersza", @@ -171,7 +171,7 @@ "c_cpp.configuration.addNodeAddonIncludePaths.description": "Dodaj ścieżki dołączania z bibliotek nan i node-addon-api, gdy są one zależnościami.", "c_cpp.configuration.renameRequiresIdentifier.description": "Jeśli ma wartość true, operacja „Zmień nazwę symbolu” będzie wymagać prawidłowego identyfikatora C/C++.", "c_cpp.configuration.autocompleteAddParentheses.description": "W przypadku podania wartości true Autouzupełnianie będzie automatycznie dodawać znak „(” po wywołaniach funkcji, co może też powodować dodawanie znaku „)” w zależności od ustawienia „editor.autoClosingBrackets”.", - "c_cpp.configuration.filesExclude.description": "Skonfiguruj wzorce globalne do wykluczania folderów (i plików, jeśli zostanie zmienione ustawienie „C_Cpp.exclusionPolicy”). Są one charakterystyczne dla rozszerzenia C/C++ i występują poza ustawieniem „files. exclude”, ale w przeciwieństwie do tego ustawienia nie można ich usuwać z widoku Eksploratora. Przeczytaj więcej na temat wzorców globalnych [tutaj](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options).", + "c_cpp.configuration.filesExclude.description": "Skonfiguruj wzorce globalne do wykluczania folderów (i plików, jeśli zostanie zmienione ustawienie „C_Cpp.exclusionPolicy”). Są one charakterystyczne dla rozszerzenia C/C++ i występują poza ustawieniem „files.exclude”, ale w przeciwieństwie do tego ustawienia nie można ich usuwać z widoku Eksploratora. Przeczytaj więcej na temat wzorców globalnych [tutaj](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options).", "c_cpp.configuration.filesExcludeBoolean.description": "Wzorzec globalny do dopasowywania ścieżek do plików. Aby włączyć lub wyłączyć wzorzec, ustaw wartość true lub false.", "c_cpp.configuration.filesExcludeWhen.description": "Dodatkowe sprawdzenie elementów równorzędnych pasującego pliku. Użyj ciągu $(basename) jako zmiennej dla nazwy pasującego pliku.", "c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "Jeśli wartość będzie równa true, podstawianie poleceń powłoki debugera będzie używać przestarzałego grawisa (`).", diff --git a/Extension/i18n/plk/src/LanguageServer/settings.i18n.json b/Extension/i18n/plk/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..32684cbe65 --- /dev/null +++ b/Extension/i18n/plk/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "Formatowanie kodu używa ustawień z pliku .editorconfig zamiast .clang-format. Aby uzyskać więcej informacji, zobacz dokumentację dotyczącą wartości „domyślna” ustawienia „C_Cpp.formatting\"." +} \ No newline at end of file diff --git a/Extension/i18n/ptb/package.i18n.json b/Extension/i18n/ptb/package.i18n.json index 1ef68dc418..abd27dbefb 100644 --- a/Extension/i18n/ptb/package.i18n.json +++ b/Extension/i18n/ptb/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "Configura o mecanismo de formatação", "c_cpp.configuration.formatting.clangFormat.description": "O clang-format será usado para formatar o código.", "c_cpp.configuration.formatting.vcFormat.description": "O mecanismo de formatação Visual C++ será usado para formatar o código.", - "c_cpp.configuration.formatting.Default.description": "O clang-format será usado para formatar o código.", + "c_cpp.configuration.formatting.Default.description": "Por padrão, clang-format será usado para formatar o código. No entanto, o mecanismo de formatação Microsoft Visual C++ será usado se um arquivo .editorconfig com configurações relevantes for encontrado mais próximo do código que está sendo formatado e clang_format_style for o valor padrão: 'arquivo'.", "c_cpp.configuration.formatting.Disabled.description": "A formatação de código será desabilitada.", "c_cpp.configuration.vcFormat.indent.braces.description": "As chaves são recuadas de acordo com o valor especificado na configuração Editor: Tamanho da Tabulação.", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "Determina em relação a que o recuo da nova linha será aplicado", diff --git a/Extension/i18n/ptb/src/LanguageServer/settings.i18n.json b/Extension/i18n/ptb/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..ff3125a386 --- /dev/null +++ b/Extension/i18n/ptb/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "A formatação do código está usando configurações de .editorconfig em vez de .clang-format. Para mais informações, veja a documentação para o valor `Default` da configuração 'C_Cpp.formatting'." +} \ No newline at end of file diff --git a/Extension/i18n/rus/package.i18n.json b/Extension/i18n/rus/package.i18n.json index c633f16a28..107d406198 100644 --- a/Extension/i18n/rus/package.i18n.json +++ b/Extension/i18n/rus/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "Настраивает подсистему форматирования.", "c_cpp.configuration.formatting.clangFormat.description": "Для форматирования кода будет использоваться clang-format.", "c_cpp.configuration.formatting.vcFormat.description": "Для форматирования кода будет использоваться подсистема форматирования Visual C++.", - "c_cpp.configuration.formatting.Default.description": "Для форматирования кода будет использоваться clang-format.", + "c_cpp.configuration.formatting.Default.description": "По умолчанию для форматирования кода будет использоваться clang-format. Однако если рядом с форматируемым файлом найден файл .editorconfig с соответствующими параметрами и параметр clang_format_style имеет значение по умолчанию (\"file\"), будет использована подсистема форматирования Visual C++.", "c_cpp.configuration.formatting.Disabled.description": "Форматирование кода будет отключено.", "c_cpp.configuration.vcFormat.indent.braces.description": "Добавление отступа для фигурных скобок на величину, указанную параметром \"Редактор: размер табуляции\".", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "Определяет, относительно чего устанавливается отступ новой строки.", diff --git a/Extension/i18n/rus/src/LanguageServer/settings.i18n.json b/Extension/i18n/rus/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..b55cea70b5 --- /dev/null +++ b/Extension/i18n/rus/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "Форматирование кода использует параметры из .editorconfig вместо .clang-format. Дополнительные сведения см. в документации, в которой приведено значение по умолчанию для параметра \"C_Cpp.formatting\"." +} \ No newline at end of file diff --git a/Extension/i18n/trk/package.i18n.json b/Extension/i18n/trk/package.i18n.json index 1267186379..86b627b4bd 100644 --- a/Extension/i18n/trk/package.i18n.json +++ b/Extension/i18n/trk/package.i18n.json @@ -29,7 +29,7 @@ "c_cpp.configuration.formatting.description": "Biçimlendirme altyapısını yapılandırır", "c_cpp.configuration.formatting.clangFormat.description": "Kodu biçimlendirmek için clang-format kullanılacak.", "c_cpp.configuration.formatting.vcFormat.description": "Kodu biçimlendirmek için Visual C++ biçimlendirme altyapısı kullanılacak.", - "c_cpp.configuration.formatting.Default.description": "Kodu biçimlendirmek için clang-format kullanılacak.", + "c_cpp.configuration.formatting.Default.description": "Varsayılan olarak, kodu biçimlendirmek için clang-format kullanılır. Ancak, ilgili ayarlara sahip bir .editorconfig dosyası, biçimlendirilmekte olan koda yaklaştığında ve clang_format_style varsayılan değer olan 'file' olduğunda Visual C++ biçimlendirme altyapısı kullanılır.", "c_cpp.configuration.formatting.Disabled.description": "Kod biçimlendirme devre dışı bırakılacak.", "c_cpp.configuration.vcFormat.indent.braces.description": "Küme ayraçları, Düzenleyici: Sekme Boyutu ayarında belirtilen miktara göre girintilenir.", "c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "Yeni satır girintisinin ne ile göreli olduğunu belirler", diff --git a/Extension/i18n/trk/src/LanguageServer/settings.i18n.json b/Extension/i18n/trk/src/LanguageServer/settings.i18n.json new file mode 100644 index 0000000000..6076fb8c29 --- /dev/null +++ b/Extension/i18n/trk/src/LanguageServer/settings.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "editorconfig.default.behavior": "Kod biçimlendirme, .clang-format yerine .editorconfig’deki ayarları kullanıyor. Daha fazla bilgi için 'C_Cpp.formatting' ayarının 'Default’ değerine yönelik belgelere bakın." +} \ No newline at end of file diff --git a/Extension/package.json b/Extension/package.json index e99bb454c4..013db1f1b7 100644 --- a/Extension/package.json +++ b/Extension/package.json @@ -983,7 +983,7 @@ "type": "number", "default": 2000, "description": "%c_cpp.configuration.intelliSenseUpdateDelay.description%", - "scope": "machine", + "scope": "application", "minimum": 500, "maximum": 3000 }, @@ -1219,7 +1219,7 @@ ], "default": "Default", "description": "%c_cpp.configuration.updateChannel.description%", - "scope": "machine" + "scope": "application" }, "C_Cpp.experimentalFeatures": { "type": "string", diff --git a/Extension/src/main.ts b/Extension/src/main.ts index 76fa163657..30734da76b 100644 --- a/Extension/src/main.ts +++ b/Extension/src/main.ts @@ -426,7 +426,10 @@ async function finalizeExtensionActivation(): Promise { const packageJson: any = util.getRawPackageJson(); let writePackageJson: boolean = false; const packageJsonPath: string = util.getExtensionFilePath("package.json"); - if (packageJsonPath.includes(".vscode-insiders") || packageJsonPath.includes(".vscode-exploration")) { + if (packageJsonPath.includes(".vscode-insiders") || + packageJsonPath.includes(".vscode-server-insiders") || + packageJsonPath.includes(".vscode-exploration") || + packageJsonPath.includes(".vscode-server-exploration")) { if (packageJson.contributes.configuration.properties['C_Cpp.updateChannel'].default === 'Default') { packageJson.contributes.configuration.properties['C_Cpp.updateChannel'].default = 'Insiders'; writePackageJson = true; diff --git a/Extension/walkthrough/installcompiler/install-compiler-windows.md b/Extension/walkthrough/installcompiler/install-compiler-windows.md index c70630757b..864bb714f7 100644 --- a/Extension/walkthrough/installcompiler/install-compiler-windows.md +++ b/Extension/walkthrough/installcompiler/install-compiler-windows.md @@ -1,7 +1,7 @@

Install a C++ compiler on Windows

If you're doing C++ development for Windows, we recommend installing the Microsoft Visual C++ (MSVC) compiler toolset. If you're targeting Linux from Windows, check out Using C++ and Windows Subsystem for Linux (WSL) in VS Code. Or, you could install GCC on Windows with MinGW.

    -

  1. To install MSVC, download C++ Build Tools from the Visual Studio Downloads page.

    +

  2. To install MSVC, download Build Tools for Visual Studio 2019 from the Visual Studio Downloads page.

  3. In the Visual Studio Installer, check the C++ build tools workload and select Install.

    diff --git a/Themes/README.md b/Themes/README.md index bf4e7c4700..70ad0ac74c 100644 --- a/Themes/README.md +++ b/Themes/README.md @@ -10,11 +10,11 @@ VS Code has since provided an API for semantic colorization. The C/C++ Extension Light Theme -![Light Theme example](https://github.com/Microsoft/vscode-cpptools/raw/main/Themes/assets/light.png) +![Light Theme example](https://raw.githubusercontent.com/microsoft/vscode-cpptools/main/Themes/assets/light.png) Dark Theme -![Dark Theme example](https://github.com/Microsoft/vscode-cpptools/raw/main/Themes/assets/dark.png) +![Dark Theme example](https://raw.githubusercontent.com/microsoft/vscode-cpptools/main/Themes/assets/dark.png) ## Contributing