Skip to content

Commit

Permalink
Merge branch 'main' into dev/gcampbell/WatchersForIncludes
Browse files Browse the repository at this point in the history
  • Loading branch information
gcampbell-msft authored Nov 21, 2024
2 parents 0e5f178 + bc0f5ec commit 0657a65
Show file tree
Hide file tree
Showing 44 changed files with 50 additions and 100 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ Improvements:

- Fix "Unable to resolve configuration with compilerPath" issue for Swift. [#4097](https://github.com/microsoft/vscode-cmake-tools/issues/4097)
- Ensure that any uses of `proc.spawn` work, especially for .bat and .cmd files, due to VS Code updating to Node 20. [#4037](https://github.com/microsoft/vscode-cmake-tools/issues/4037)
- Fix "Test output isn't visible when failed" and also mark skipped tests as so. [#4116](https://github.com/microsoft/vscode-cmake-tools/issues/4116)
- Ensure that stopping tests actually forces the tests to stop running. [#2095](https://github.com/microsoft/vscode-cmake-tools/issues/2095)
- Retire the Show Options Moved Notification [#4039](https://github.com/microsoft/vscode-cmake-tools/issues/4039)
- Improve the pinned commands experience by defaulting settings and using VS Code state rather than modifying user settings. [#3977](https://github.com/microsoft/vscode-cmake-tools/issues/3977)

Bug Fixes:

Expand Down
1 change: 0 additions & 1 deletion i18n/chs/package.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@
"cmake-tools.configuration.cmake.touchbar.visibility.description": "配置扩展在 MacBook 触控栏上显示按钮的方式。",
"cmake-tools.configuration.cmake.touchbar.visibility.default.description": "在支持的系统上显示触控栏按钮。",
"cmake-tools.configuration.cmake.touchbar.visibility.hidden.description": "不显示触控栏按钮。",
"cmake-tools.configuration.cmake.showOptionsMovedNotification": "启用有关移动到项目状态视图的状态栏选项的通知,以便在扩展启动时显示。",
"cmake-tools.configuration.cmake.showConfigureWithDebuggerNotification": "启用弹出窗口,询问用户在配置失败时是否要使用 CMake 调试器进行配置。",
"cmake-tools.configuration.cmake.showNotAllDocumentsSavedQuestion": "启用弹出窗口,以询问用户是否要在一些文件可能未保存的情况下继续生成。如果未启用,则将继续生成。",
"cmake-tools.configuration.cmake.options.advanced.statusBarVisibility.visible.description": "以完整大小显示状态栏选项。",
Expand Down
2 changes: 1 addition & 1 deletion i18n/chs/src/ctest.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"no.driver.found": "找不到文件夹 {0} 的驱动程序",
"ctest.args.not.found": "无法获取测试参数",
"test.results.not.found": "找不到测试结果。",
"test.failed.with.exit.code": "测试{0}失败,退出代码 {1}。",
"test.failed.with.exit.code": "{0}\n测试 {1} 失败,退出代码: {2}。",
"test.failed.with.completion.status": "测试{0}失败,完成状态为 \"{1}\"",
"test.failed": "测试{0}失败。有关详细信息,请检查输出。",
"ctest.run.cancelled": "已取消 CTest 运行",
Expand Down
3 changes: 0 additions & 3 deletions i18n/chs/src/extension.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,5 @@
"loading.extension.commands": "正在加载扩展命令",
"register.command": "注册 CMakeTools 扩展命令 {0}",
"uninstall.old.cmaketools": "请卸载 CMake Tools 扩展的所有较早版本。现在自版本 1.2.0 起,它由 Microsoft 发布。",
"options.moved.notification.body": "CMake 工具中的某些状态栏选项现在已移动到 CMake 工具边栏中的项目状态视图。可以在设置中使用“cmake.options”属性自定义视图。",
"options.moved.notification.configure.cmake.options": "配置 CMake 选项可见性",
"options.moved.notification.do.not.show": "不再显示",
"deactivate.cmaketools": "停用 CMakeTools"
}
1 change: 0 additions & 1 deletion i18n/cht/package.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@
"cmake-tools.configuration.cmake.touchbar.visibility.description": "設定延伸模組在 MacBook 觸控列上顯示按鈕的方式。",
"cmake-tools.configuration.cmake.touchbar.visibility.default.description": "在支援的系統上顯示觸控列按鈕。",
"cmake-tools.configuration.cmake.touchbar.visibility.hidden.description": "不顯示觸控列按鈕。",
"cmake-tools.configuration.cmake.showOptionsMovedNotification": "啟用有關移至 [專案狀態檢視] 之狀態列選項的通知,以在延伸模組開始時顯示。",
"cmake-tools.configuration.cmake.showConfigureWithDebuggerNotification": "啟用會詢問使用者在設定失敗時是否要使用 CMake 偵錯工具進行設定的快顯。",
"cmake-tools.configuration.cmake.showNotAllDocumentsSavedQuestion": "啟用詢問使用者是否要繼續建置的快顯,儘管某些檔案可能未儲存。若未啟用,將會繼續建置。",
"cmake-tools.configuration.cmake.options.advanced.statusBarVisibility.visible.description": "以完整大小顯示狀態列選項。",
Expand Down
2 changes: 1 addition & 1 deletion i18n/cht/src/ctest.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"no.driver.found": "找不到資料夾 {0} 的驅動程式",
"ctest.args.not.found": "無法取得測試引數",
"test.results.not.found": "找不到測試結果。",
"test.failed.with.exit.code": "測試 {0} 失敗,結束代碼為 {1}。",
"test.failed.with.exit.code": "{0}\n測試 {1} 失敗,結束代碼為 {2}。",
"test.failed.with.completion.status": "測試 {0} 失敗,完成狀態為「{1}」。",
"test.failed": "測試 {0} 失敗。如需詳細資訊,請檢查輸出。",
"ctest.run.cancelled": "已取消 CTest 執行",
Expand Down
3 changes: 0 additions & 3 deletions i18n/cht/src/extension.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,5 @@
"loading.extension.commands": "正在載入延伸模組命令",
"register.command": "註冊 CMakeTools 延伸模組命令 {0}",
"uninstall.old.cmaketools": "請將所有較舊的 CMake 工具延伸模組版本解除安裝。它現在由 Microsoft 從版本 1.2.0 開始發佈。",
"options.moved.notification.body": "CMake 工具中的部分狀態列選項現在已移至 CMake 工具提要欄位中的 [專案狀態檢視]。您可以在設定中使用 'cmake.options' 屬性自訂您的檢視。",
"options.moved.notification.configure.cmake.options": "設定 CMake 選項可見度",
"options.moved.notification.do.not.show": "不要再顯示",
"deactivate.cmaketools": "停用 CMakeTools"
}
1 change: 0 additions & 1 deletion i18n/csy/package.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@
"cmake-tools.configuration.cmake.touchbar.visibility.description": "Nakonfiguruje, jak rozšíření zobrazuje tlačítka na Touch Baru na MacBooku.",
"cmake-tools.configuration.cmake.touchbar.visibility.default.description": "Umožňuje zobrazit na podporovaných systémech tlačítka Touch Baru.",
"cmake-tools.configuration.cmake.touchbar.visibility.hidden.description": "Nezobrazovat tlačítka Touch Baru",
"cmake-tools.configuration.cmake.showOptionsMovedNotification": "Povolí oznámení týkající se možností stavového řádku, které se přesunou do zobrazení stavu projektu, aby se zobrazily při spuštění rozšíření.",
"cmake-tools.configuration.cmake.showConfigureWithDebuggerNotification": "Povolí automaticky otevírané okno, které se uživatele zeptá, jestli chce při neúspěšné konfiguraci provést konfiguraci pomocí ladicího programu CMake.",
"cmake-tools.configuration.cmake.showNotAllDocumentsSavedQuestion": "Povolí automaticky otevírané okno s dotazem uživatele, jestli chce pokračovat v sestavení, i když některé soubory se pravděpodobně neukládají. Pokud není povoleno, bude sestavení pokračovat.",
"cmake-tools.configuration.cmake.options.advanced.statusBarVisibility.visible.description": "Umožňuje zobrazit možnost stavového řádku v plné velikosti.",
Expand Down
2 changes: 1 addition & 1 deletion i18n/csy/src/ctest.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"no.driver.found": "Pro složku {0} se nenašel žádný ovladač.",
"ctest.args.not.found": "Nepovedlo se získat argumenty testu.",
"test.results.not.found": "Výsledky testu se nenašly.",
"test.failed.with.exit.code": "Test {0} byl neúspěšný s ukončovacím kódem {1}.",
"test.failed.with.exit.code": "{0}\nTest {1} byl neúspěšný s ukončovacím kódem {2}.",
"test.failed.with.completion.status": "Test {0} byl neúspěšný se stavem dokončení {1}.",
"test.failed": "Test {0} byl neúspěšný. Další informace najdete ve výstupu.",
"ctest.run.cancelled": "Spuštění příkazu CTest bylo zrušeno.",
Expand Down
3 changes: 0 additions & 3 deletions i18n/csy/src/extension.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,5 @@
"loading.extension.commands": "Načítání příkazů rozšíření",
"register.command": "Zaregistrujte příkaz rozšíření CMakeTools {0}.",
"uninstall.old.cmaketools": "Odinstalujte prosím všechny starší verze rozšíření CMake Tools. Od verze 1.2.0 jej publikuje Microsoft.",
"options.moved.notification.body": "Některé možnosti stavového řádku v nástrojích CMake se teď přesunuly do zobrazení stavu projektu na bočním panelu nástrojů CMake. Zobrazení můžete přizpůsobit pomocí vlastnosti cmake.options v nastavení.",
"options.moved.notification.configure.cmake.options": "Nakonfigurovat viditelnost možností CMake",
"options.moved.notification.do.not.show": "Už nezobrazovat",
"deactivate.cmaketools": "Deaktivovat CMakeTools"
}
1 change: 0 additions & 1 deletion i18n/deu/package.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@
"cmake-tools.configuration.cmake.touchbar.visibility.description": "Hiermit wird konfiguriert, wie die Erweiterung die Schaltflächen auf einer MacBook Touch Bar anzeigt.",
"cmake-tools.configuration.cmake.touchbar.visibility.default.description": "Hiermit werden die Touch Bar-Schaltflächen auf unterstützten Systemen angezeigt.",
"cmake-tools.configuration.cmake.touchbar.visibility.hidden.description": "Hiermit werden die Touch Bar-Schaltflächen nicht angezeigt.",
"cmake-tools.configuration.cmake.showOptionsMovedNotification": "Aktiviert die Benachrichtigung über die Statusleistenoptionen, die in die Projektstatusansicht verschoben werden, um anzuzeigen, wann die Erweiterung gestartet wird.",
"cmake-tools.configuration.cmake.showConfigureWithDebuggerNotification": "Aktiviert das Popup, das den Benutzer fragt, ob er bei einer fehlerhaften Konfiguration mit dem CMake Debugger konfigurieren möchte.",
"cmake-tools.configuration.cmake.showNotAllDocumentsSavedQuestion": "Aktiviert das Popup, das den Benutzer fragt, ob er den Buildvorgang fortsetzen möchte, obwohl einige Dateien möglicherweise nicht gespeichert werden. Wenn diese Option nicht aktiviert ist, wird der Buildvorgang fortgesetzt.",
"cmake-tools.configuration.cmake.options.advanced.statusBarVisibility.visible.description": "Zeigt die Statusleistenoption in voller Größe an.",
Expand Down
2 changes: 1 addition & 1 deletion i18n/deu/src/ctest.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"no.driver.found": "Für den Ordner {0} wurde kein Treiber gefunden.",
"ctest.args.not.found": "Testargumente konnten nicht abgerufen werden.",
"test.results.not.found": "Die Testergebnisse wurden nicht gefunden.",
"test.failed.with.exit.code": "Fehler beim Test \"{0}\" mit Exitcode \"{1}\".",
"test.failed.with.exit.code": "{0}\nFehler beim Test „{1}“ mit Exitcode „{2}“.",
"test.failed.with.completion.status": "Fehler beim Test \"{0}\" mit dem Abschlussstatus \"{1}\".",
"test.failed": "Fehler beim Test \"{0}\". Weitere Informationen finden Sie in der Ausgabe.",
"ctest.run.cancelled": "C-Testlauf wurde abgebrochen.",
Expand Down
3 changes: 0 additions & 3 deletions i18n/deu/src/extension.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,5 @@
"loading.extension.commands": "Erweiterungsbefehle werden geladen.",
"register.command": "Registrieren von CMakeTools-Erweiterungsbefehl {0}",
"uninstall.old.cmaketools": "Deinstallieren Sie alle älteren Versionen der CMake Tools-Erweiterung. Sie wird jetzt von Microsoft ab Version 1.2.0 veröffentlicht.",
"options.moved.notification.body": "Einige Statusleistenoptionen in den CMake-Tools wurden jetzt in die Projektstatusansicht in der Randleiste der CMake-Tools verschoben. Sie können Ihre Ansicht mit der Eigenschaft „cmake.options“ in den Einstellungen anpassen.",
"options.moved.notification.configure.cmake.options": "Konfigurieren der Sichtbarkeit von CMake-Optionen",
"options.moved.notification.do.not.show": "Nicht mehr anzeigen",
"deactivate.cmaketools": "CMakeTools deaktivieren"
}
1 change: 0 additions & 1 deletion i18n/esn/package.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@
"cmake-tools.configuration.cmake.touchbar.visibility.description": "Configura cómo la extensión muestra los botones en la Touch Bar de un MacBook.",
"cmake-tools.configuration.cmake.touchbar.visibility.default.description": "Muestra los botones de la barra táctil en los sistemas compatibles.",
"cmake-tools.configuration.cmake.touchbar.visibility.hidden.description": "No muestra los botones de la barra táctil.",
"cmake-tools.configuration.cmake.showOptionsMovedNotification": "Habilita la notificación sobre el movimiento de las opciones de la barra de estado a la vista Estado del proyecto para mostrar cuándo se inicia la extensión.",
"cmake-tools.configuration.cmake.showConfigureWithDebuggerNotification": "Habilita el elemento emergente que pregunta al usuario si, tras un error de configuración, quiere configurarlo con el depurador de CMake.",
"cmake-tools.configuration.cmake.showNotAllDocumentsSavedQuestion": "Habilita el elemento emergente que pregunta al usuario si desea continuar con la compilación a pesar de que es posible que algunos archivos no se guarden. Si no está habilitada, la compilación continuará.",
"cmake-tools.configuration.cmake.options.advanced.statusBarVisibility.visible.description": "Muestra la opción de barra de estado a tamaño completo.",
Expand Down
2 changes: 1 addition & 1 deletion i18n/esn/src/ctest.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"no.driver.found": "No se ha encontrado ningún controlador para la carpeta {0}",
"ctest.args.not.found": "No se pudieron obtener los argumentos de prueba",
"test.results.not.found": "No se encontraron los resultados de la prueba.",
"test.failed.with.exit.code": "La prueba {0} ha fallado con código {1} de salida .",
"test.failed.with.exit.code": "{0}\nError de prueba {1} con código de salida{2}.",
"test.failed.with.completion.status": "La prueba {0} fallida con estado de finalización \"{1}\".",
"test.failed": "La prueba {0} ha fallado. Compruebe el resultado para obtener más información.",
"ctest.run.cancelled": "Se canceló la ejecución de CTest",
Expand Down
3 changes: 0 additions & 3 deletions i18n/esn/src/extension.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,5 @@
"loading.extension.commands": "Cargando los comandos de la extensión",
"register.command": "Registrar el comando de la extensión CMakeTools {0}",
"uninstall.old.cmaketools": "Desinstale cualquier versión anterior de la extensión Herramientas de CMake, que ahora publica Microsoft a partir de la versión 1.2.0.",
"options.moved.notification.body": "Algunas opciones de la barra de estado de herramientas de CMake se han movido a la vista Estado del proyecto en la barra lateral de herramientas de CMake. Puede personalizar la vista con la propiedad \"cmake.options\" en la configuración.",
"options.moved.notification.configure.cmake.options": "Configurar la visibilidad de las opciones de CMake",
"options.moved.notification.do.not.show": "No volver a mostrar",
"deactivate.cmaketools": "Desactivar CMakeTools"
}
1 change: 0 additions & 1 deletion i18n/fra/package.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@
"cmake-tools.configuration.cmake.touchbar.visibility.description": "Configure la façon dont l'extension affiche les boutons sur une barre tactile MacBook.",
"cmake-tools.configuration.cmake.touchbar.visibility.default.description": "Affiche les boutons de la Touch Bar sur les systèmes pris en charge.",
"cmake-tools.configuration.cmake.touchbar.visibility.hidden.description": "N'affiche pas les boutons de la Touch Bar.",
"cmake-tools.configuration.cmake.showOptionsMovedNotification": "Active la notification concernant les options de la barre d'état déplacées vers la vue d'état du projet pour afficher le moment où l'extension démarre.",
"cmake-tools.configuration.cmake.showConfigureWithDebuggerNotification": "Active la fenêtre contextuelle qui demande à l’utilisateur si, en cas d’échec de la configuration, il souhaite la configurer avec le débogueur CMake.",
"cmake-tools.configuration.cmake.showNotAllDocumentsSavedQuestion": "Active la fenêtre contextuelle qui demande à l’utilisateur s’il souhaite poursuivre la génération malgré l’échec de l’enregistrement de certains fichiers. Si cette option n’est pas activée, la build continue.",
"cmake-tools.configuration.cmake.options.advanced.statusBarVisibility.visible.description": "Afficher l'option de la barre d'état en taille réelle.",
Expand Down
2 changes: 1 addition & 1 deletion i18n/fra/src/ctest.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"no.driver.found": "Pilote introuvable pour le dossier {0}",
"ctest.args.not.found": "Impossible d’obtenir les arguments de test",
"test.results.not.found": "Résultats des tests introuvables.",
"test.failed.with.exit.code": "Échec du test {0} avec le code de sortie {1}.",
"test.failed.with.exit.code": "{0}\nÉchec du test {1} avec le code de sortie {2}.",
"test.failed.with.completion.status": "Échec du test {0} avec l’état d’achèvement « {1} ».",
"test.failed": "Échec du test {0}. Pour plus d’informations, consultez la sortie.",
"ctest.run.cancelled": "L’exécution de CTest a été annulée",
Expand Down
3 changes: 0 additions & 3 deletions i18n/fra/src/extension.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,5 @@
"loading.extension.commands": "Chargement des commandes d'extension",
"register.command": "Inscrire la commande d'extension CMakeTools {0}",
"uninstall.old.cmaketools": "Désinstallez les anciennes versions de l'extension CMake Tools. Elle est désormais publiée par Microsoft à partir de la version 1.2.0.",
"options.moved.notification.body": "Certaines options de la barre d'état dans CMake Tools ont maintenant été déplacées vers la vue d'état du projet dans la barre latérale de CMake Tools. Affichez le nœud dans la vue d'état du projet. Vous pouvez personnaliser votre vue avec la propriété « cmake.options » dans les paramètres.",
"options.moved.notification.configure.cmake.options": "Configurer la visibilité des options CMake",
"options.moved.notification.do.not.show": "Ne plus afficher",
"deactivate.cmaketools": "Désactiver CMakeTools"
}
1 change: 0 additions & 1 deletion i18n/ita/package.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@
"cmake-tools.configuration.cmake.touchbar.visibility.description": "Configura il modo in cui l'estensione visualizza i pulsanti su una Touch Bar del MacBook.",
"cmake-tools.configuration.cmake.touchbar.visibility.default.description": "Mostra i pulsanti della Touch Bar sui sistemi supportati.",
"cmake-tools.configuration.cmake.touchbar.visibility.hidden.description": "Non visualizza i pulsanti della Touch Bar.",
"cmake-tools.configuration.cmake.showOptionsMovedNotification": "Consente di attivare la notifica relativa alle opzioni della barra di stato che si spostano nella visualizzazione Stato del progetto per visualizzarla all'avvio dell'estensione.",
"cmake-tools.configuration.cmake.showConfigureWithDebuggerNotification": "Abilita il pop-up che chiede all'utente se, dopo una configurazione non riuscita, vuole configurare con il Debugger CMake.",
"cmake-tools.configuration.cmake.showNotAllDocumentsSavedQuestion": "Abilita il popup che chiede all'utente se vuole continuare la compilazione nonostante alcuni file potrebbero non essere salvati. Se questa opzione non è abilitata, la compilazione continuerà.",
"cmake-tools.configuration.cmake.options.advanced.statusBarVisibility.visible.description": "Mostra l'opzione della barra di stato a schermo intero.",
Expand Down
2 changes: 1 addition & 1 deletion i18n/ita/src/ctest.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"no.driver.found": "Nessun driver trovato per la cartella {0}",
"ctest.args.not.found": "Non è stato possibile ottenere gli argomenti di test",
"test.results.not.found": "Risultati del test non trovati.",
"test.failed.with.exit.code": "Test {0} non riuscito con codice di uscita {1}.",
"test.failed.with.exit.code": "{0}\nTest {1} non riuscito con codice di uscita {2}.",
"test.failed.with.completion.status": "Test {0} non riuscito con stato di completamento \"{1}\".",
"test.failed": "Test {0} non riuscito. Per altre informazioni, controllare l'output.",
"ctest.run.cancelled": "Esecuzione CTest annullata",
Expand Down
3 changes: 0 additions & 3 deletions i18n/ita/src/extension.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,5 @@
"loading.extension.commands": "Caricamento dei comandi dell'estensione",
"register.command": "Registra il comando {0} dell'estensione CMakeTools",
"uninstall.old.cmaketools": "Disinstallare le versioni precedenti dell'estensione CMake Tools. Tale estensione è ora pubblicata da Microsoft a partire dalla versione 1.2.0.",
"options.moved.notification.body": "Alcune opzioni della barra di stato in CMake Tools sono state spostate nella visualizzazione stato progetto nella barra laterale di CMake Tools. È possibile personalizzare la visualizzazione con la proprietà 'cmake.options' nelle impostazioni.",
"options.moved.notification.configure.cmake.options": "Configurare la visibilità delle opzioni di CMake",
"options.moved.notification.do.not.show": "Non visualizzare più questo messaggio",
"deactivate.cmaketools": "Disattiva CMakeTools"
}
Loading

0 comments on commit 0657a65

Please sign in to comment.