Merge remote-tracking branch 'origin/2027' into ui-improvements-2-electric-boogaloo

nobody5050 · nobody5050 · commit 5f70b301482d · 2025-10-30T22:03:01.000-05:00
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/actions/wrapper-validation@v4
diff --git a/vscode-wpilib/package-lock.json b/vscode-wpilib/package-lock.json
diff --git a/vscode-wpilib/package.json b/vscode-wpilib/package.json
@@ -99,7 +99,7 @@
         ],
         "configuration": {
             "type": "object",
-            "title": "WPILib configuration",
+            "title": "WPILib",
             "properties": {
                 "wpilib.additionalGradleArguments": {
                     "type": "string",
@@ -450,6 +450,7 @@
             ],
             "view/title": [
                 {
+                    "when": "view.wpilib.dependencyView.visible",
                     "command": "wpilib.refreshVendordeps",
                     "group": "navigation"
                 }
diff --git a/vscode-wpilib/resources/gradle/java/.vscode/settings.json b/vscode-wpilib/resources/gradle/java/.vscode/settings.json
@@ -56,5 +56,6 @@
     "edu.wpi.first.math.proto.*",
     "edu.wpi.first.math.**.proto.*",
     "edu.wpi.first.math.**.struct.*",
-  ]
+  ],
+  "java.dependency.enableDependencyCheckup": false
 }
diff --git a/vscode-wpilib/resources/gradle/java/build.gradle b/vscode-wpilib/resources/gradle/java/build.gradle
@@ -43,7 +43,8 @@ deploy {
 
 def deployArtifact = deploy.targets.systemcore.artifacts.frcJava
 
-// Set to true to use debug for JNI.
+// Set to true to use debug for all targets including JNI, which will drastically impact
+// performance.
 wpi.java.debugJni = false
 
 // Set this to true to enable desktop support.
diff --git a/vscode-wpilib/resources/gradle/javadt/.vscode/settings.json b/vscode-wpilib/resources/gradle/javadt/.vscode/settings.json
@@ -38,5 +38,6 @@
     "org.mockito.ArgumentMatchers.*",
     "org.mockito.Answers.*",
     "edu.wpi.first.units.Units.*"
-  ]
+  ],
+  "java.dependency.enableDependencyCheckup": false
 }
diff --git a/vscode-wpilib/resources/gradle/javaromi/.vscode/settings.json b/vscode-wpilib/resources/gradle/javaromi/.vscode/settings.json
@@ -57,5 +57,6 @@
     "edu.wpi.first.math.proto.*",
     "edu.wpi.first.math.**.proto.*",
     "edu.wpi.first.math.**.struct.*",
-  ]
+  ],
+  "java.dependency.enableDependencyCheckup": false
 }
diff --git a/vscode-wpilib/resources/gradle/javaxrp/.vscode/settings.json b/vscode-wpilib/resources/gradle/javaxrp/.vscode/settings.json
@@ -57,5 +57,6 @@
     "edu.wpi.first.math.proto.*",
     "edu.wpi.first.math.**.proto.*",
     "edu.wpi.first.math.**.struct.*",
-  ]
+  ],
+  "java.dependency.enableDependencyCheckup": false
 }
diff --git a/vscode-wpilib/resources/webviews/help.html b/vscode-wpilib/resources/webviews/help.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <html>
+
   <head>
     <title>WPILib Help</title>
     <meta charset="UTF-8" />
@@ -15,13 +16,20 @@ <h1 class="project-title">WPILib Help</h1>
 
       <div class="project-row">
         <p>
-          Welcome to WPILib Help! To open this window again, open the Command Palette (F1 or
+          Welcome to WPILib Help! Thank you for alpha testing the Systemcore and 2027 WPILib. Please see
+          <a href="https://github.com/wpilibsuite/SystemcoreTesting/">
+            https://github.com/wpilibsuite/SystemcoreTesting/</a>
+          for the expectations for testing and to provide your feedback.
+        </p>
+
+        <p>
+          To open this window again, open the Command Palette (F1 or
           View->Command Palette), and select
           <b>Open WPILib Help.</b>
         </p>
         <p>
           For more help, see
-          <a href="https://docs.wpilib.org/en/stable">the WPILib documentation.</a>
+          <a href="https://docs.wpilib.org/en/2027">the 2027 WPILib documentation.</a>
         </p>
       </div>
 
@@ -79,4 +87,5 @@ <h2 class="project-subtitle">Setting Up Your Workspace</h2>
       });
     </script>
   </body>
-</html>
+
+</html>
diff --git a/vscode-wpilib/src/builtintools.ts b/vscode-wpilib/src/builtintools.ts
@@ -29,7 +29,7 @@ class VbsToolRunner implements IToolRunner {
   public async runTool(): Promise<boolean> {
     const wp = await this.preferences.getFirstOrSelectedWorkspace();
     return new Promise<boolean>((resolve, _reject) => {
-      let cmd = getIsWindows() ? `wscript.exe ${this.toolScript}` : `sh ${this.toolScript}`;
+      let cmd = `${this.toolScript}`;
 
       if (wp !== undefined) {
         const toolStoreFolder = path.join(wp.uri.fsPath, `.${this.name}`);
@@ -61,13 +61,13 @@ export class BuiltinTools {
     const isWindows = getIsWindows();
     for (const ht of homeTools.tools) {
       if (isWindows) {
-        const toolPath = path.join(homeTools.dir, ht.name + '.vbs');
+        const toolPath = path.join(homeTools.dir, ht.name + '.exe');
         if (await existsAsync(toolPath)) {
           // Tool exists, add it
           toolApi.addTool(new VbsToolRunner(toolPath, ht.name, api.getPreferencesAPI()));
         }
       } else {
-        const toolPath = path.join(homeTools.dir, ht.name + '.sh');
+        const toolPath = path.join(homeTools.dir, ht.name);
         if (await existsAsync(toolPath)) {
           // Tool exists, add it
           toolApi.addTool(new VbsToolRunner(toolPath, ht.name, api.getPreferencesAPI()));
diff --git a/vscode-wpilib/src/dependencyView.ts b/vscode-wpilib/src/dependencyView.ts
@@ -48,7 +48,8 @@ export class DependencyViewProvider implements vscode.WebviewViewProvider {
   private vendordepMarketplaceURL = `https://frcmaven.wpi.edu/artifactory/vendordeps/vendordep-marketplace/`;
   private wp: vscode.WorkspaceFolder | undefined;
   private changed = 0;
-  private refreshInProgress = false; // Prevent concurrent refreshes
+  private refreshInProgress = false;
+  private showingInstructions = false;
 
   private _view?: vscode.WebviewView;
 
@@ -122,7 +123,9 @@ export class DependencyViewProvider implements vscode.WebviewViewProvider {
         if (webviewView.visible) {
           void this._refresh(this.wp);
         } else {
-          if (this.changed > this.vendorLibraries.getLastBuild()) {
+          if (this.showingInstructions) {
+            this.showingInstructions = false;
+          } else if (this.changed > this.vendorLibraries.getLastBuild()) {
             this.externalApi.getBuildTestAPI().buildCode(this.wp, undefined);
             this.changed = 0;
           }
@@ -161,7 +164,9 @@ export class DependencyViewProvider implements vscode.WebviewViewProvider {
           }
           case 'blur': {
             if (this.wp) {
-              if (this.changed > this.vendorLibraries.getLastBuild()) {
+              if (this.showingInstructions) {
+                this.showingInstructions = false;
+              } else if (this.changed > this.vendorLibraries.getLastBuild()) {
                 this.externalApi.getBuildTestAPI().buildCode(this.wp, undefined);
                 this.changed = 0;
               }
@@ -268,6 +273,7 @@ export class DependencyViewProvider implements vscode.WebviewViewProvider {
 
           if (success) {
             if (avail.instructions) {
+              this.showingInstructions = true;
               try {
                 new URL(avail.instructions);
                 await vscode.commands.executeCommand('simpleBrowser.show', avail.instructions);

Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,6 @@`
`56`	`56`	`"edu.wpi.first.math.proto.*",`
`57`	`57`	`"edu.wpi.first.math.*.proto.",`
`58`	`58`	`"edu.wpi.first.math.*.struct.",`
`59`		`- ]`
	`59`	`+ ],`
	`60`	`+ "java.dependency.enableDependencyCheckup": false`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,6 @@`
`38`	`38`	`"org.mockito.ArgumentMatchers.*",`
`39`	`39`	`"org.mockito.Answers.*",`
`40`	`40`	`"edu.wpi.first.units.Units.*"`
`41`		`- ]`
	`41`	`+ ],`
	`42`	`+ "java.dependency.enableDependencyCheckup": false`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,6 @@`
`57`	`57`	`"edu.wpi.first.math.proto.*",`
`58`	`58`	`"edu.wpi.first.math.*.proto.",`
`59`	`59`	`"edu.wpi.first.math.*.struct.",`
`60`		`- ]`
	`60`	`+ ],`
	`61`	`+ "java.dependency.enableDependencyCheckup": false`
`61`	`62`	`}`