Skip to content

Commit 2b9357c

Browse files
authored
Final cleanup (#16)
* Undo no-op changes and restore Manage Vendor Libraries * Add missing vscode-elements CSS
1 parent 009ad8b commit 2b9357c

File tree

11 files changed

+337
-16
lines changed

11 files changed

+337
-16
lines changed

vscode-wpilib/locale/zh-cn/message.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ No tools found. Would you like to use Gradle to grab some?: 没找到工具,
6565
# Can only extract to absolute path
6666
# Please select project type, language, and base.
6767
# Could not find cpptools C++ extension. Debugging is disabled.
68+
# Could not find Debugger for Java extension. Debugging is disabled.

vscode-wpilib/locale/zh-cn/package.i18n.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ wpilibcore.refreshCppProperties.title: 更新 Gradle C++ 属性
1616
wpilibcore.selectCppToolchain.title: 选择当前的 C++ 工具链
1717
wpilibcore.importGradle2025Project.title: 将 Gradle 2025 项目迁移到 VSCode
1818
wpilibcore.createNewProject.title: 创建一个新项目
19+
wpilibcore.manageVendorLibs.title: 管理外部供应商库
1920
wpilibcore.setJavaHome.title: 设置 Java 环境
2021
wpilibcore.checkForUpdates.title: 检查 WPILib 更新
2122
wpilibcore.installGradleTools.title: 从 GradleRIO 安装工具

vscode-wpilib/package.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"onCommand:wpilibcore.selectCppBinaryTypes",
3636
"onCommand:wpilibcore.importGradle2025Project",
3737
"onCommand:wpilibcore.createNewProject",
38+
"onCommand:wpilibcore.manageVendorLibs",
3839
"onCommand:wpilibcore.setJavaHome",
3940
"onCommand:wpilibcore.checkForUpdates",
4041
"onCommand:wpilibcore.installGradleTools",
@@ -279,6 +280,12 @@
279280
"title": "%wpilibcore.createNewProject.title%",
280281
"category": "WPILib"
281282
},
283+
{
284+
"command": "wpilibcore.manageVendorLibs",
285+
"title": "%wpilibcore.manageVendorLibs.title%",
286+
"category": "WPILib",
287+
"enablement": "isWorkspaceTrusted"
288+
},
282289
{
283290
"command": "wpilibcore.setJavaHome",
284291
"title": "%wpilibcore.setJavaHome.title%",
@@ -430,6 +437,11 @@
430437
"command": "wpilibcore.testCode",
431438
"group": "wpilib"
432439
},
440+
{
441+
"when": "resourceFilename == build.gradle",
442+
"command": "wpilibcore.manageVendorLibs",
443+
"group": "wpilib"
444+
},
433445
{
434446
"when": "explorerResourceIsFolder && isWPILibProject",
435447
"command": "wpilibcore.createCommand",

vscode-wpilib/package.nls.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"wpilibcore.selectCppToolchain.title": "Select Current C++ Toolchain",
1818
"wpilibcore.importGradle2025Project.title": "Import a WPILib 2025 Gradle project",
1919
"wpilibcore.createNewProject.title": "Create a new project",
20+
"wpilibcore.manageVendorLibs.title": "Manage Vendor Libraries",
2021
"wpilibcore.setJavaHome.title": "Set VS Code Java Home to FRC Home",
2122
"wpilibcore.checkForUpdates.title": "Check for WPILib Updates",
2223
"wpilibcore.installGradleTools.title": "Install tools from GradleRIO",

vscode-wpilib/src/dependencyView.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,7 @@ export class DependencyViewProvider implements vscode.WebviewViewProvider {
680680

681681
const scriptUri = createUri(`resources/media/main.js`);
682682
const styleUri = createUri(`resources/media/main.css`);
683+
const vscodeElementsUri = createUri(`resources/media/vscode-elements.css`);
683684
const codiconUri = createUri(`resources/media/icons.css`);
684685

685686
// Return the complete HTML
@@ -690,10 +691,12 @@ export class DependencyViewProvider implements vscode.WebviewViewProvider {
690691
<meta charset="UTF-8">
691692
<meta name="viewport" content="width=device-width, initial-scale=1.0">
692693
<title>WPILib Vendor Dependencies</title>
694+
<link rel="preload" href="${vscodeElementsUri}" as="style">
693695
<link rel="preload" href="${styleUri}" as="style">
694696
<link rel="preload" href="${codiconUri}" as="style">
695697
<link rel="preload" href="${scriptUri}" as="script">
696698
699+
<link rel="stylesheet" href="${vscodeElementsUri}">
697700
<link rel="stylesheet" href="${styleUri}">
698701
<link rel="stylesheet" href="${codiconUri}" id="vscode-codicon-stylesheet">
699702
<style>

vscode-wpilib/src/shared/vendorexamples.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import * as jsonc from 'jsonc-parser';
44
import * as path from 'path';
55
import * as vscode from 'vscode';
66
import { IExampleTemplateAPI, IExampleTemplateCreator, IUtilitiesAPI } from '../api';
7+
import { localize as i18n } from '../locale';
78
import { logger } from '../logger';
89
import {
910
existsAsync,
@@ -12,7 +13,6 @@ import {
1213
readFileAsync,
1314
statAsync,
1415
} from '../utilities';
15-
import { localize as i18n } from '../locale';
1616
import { generateCopyCpp, generateCopyJava } from './generator';
1717
import { VendorLibrariesBase } from './vendorlibrariesbase';
1818

0 commit comments

Comments
 (0)