Merge branch 'main' into fix/missing-dart-extension

microsoft · Jan 14, 2025 · 2826567 · 2826567
2 parents 0087c12 + 11cd214
commit 2826567
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/scripts/update-vscode-releases.ps1 b/scripts/update-vscode-releases.ps1
@@ -39,8 +39,9 @@ if ($version -like "*-preview.*") {
   $updatedPatchVersion += (Get-Date).ToString("yyMMdd") + $sequenceNumber
 }
 else {
-  if ($updatedPatchVersion -eq "1") {
-    $updatedPatchVersion = "100000002"
+  $updatedPatchVersionAsNumber = 0;
+  if ([int]::TryParse($updatedPatchVersion, [ref]$updatedPatchVersionAsNumber)) {
+    $updatedPatchVersion = "10000000$($updatedPatchVersionAsNumber + 1)"
   }
   elseif ([string]::IsNullOrWhiteSpace($updatedPatchVersion)) {
     $updatedPatchVersion = "100000001"

diff --git a/vscode/microsoft-kiota/CHANGELOG.md b/vscode/microsoft-kiota/CHANGELOG.md
@@ -10,6 +10,8 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- Fixed a bug in the VS Code extension deeplink with the API Center extension [#6004](https://github.com/microsoft/kiota/issues/6004)
+
 ## [1.22.100000001] - 2025-01-10
 
 ### Added

diff --git a/vscode/microsoft-kiota/src/handlers/uriHandler.ts b/vscode/microsoft-kiota/src/handlers/uriHandler.ts
@@ -1,10 +1,12 @@
-import * as vscode from 'vscode';
 import TelemetryReporter from '@vscode/extension-telemetry';
+import * as vscode from 'vscode';
 
+import { treeViewId } from '../constants';
 import { OpenApiTreeProvider } from "../providers/openApiTreeProvider";
+import { updateTreeViewIcons } from '../util';
 import { validateDeepLinkQueryParams } from '../utilities/deep-linking';
 import { openTreeViewWithProgress } from '../utilities/progress';
-import { setDeepLinkParams, getDeepLinkParams } from './deepLinkParamsHandler';
+import { getDeepLinkParams, setDeepLinkParams } from './deepLinkParamsHandler';
 
 export class UriHandler {
   constructor(private context: vscode.ExtensionContext, private openApiTreeProvider: OpenApiTreeProvider) { }
@@ -26,7 +28,10 @@ export class UriHandler {
 
       let deepLinkParams = getDeepLinkParams();
       if (deepLinkParams.descriptionurl) {
-        await openTreeViewWithProgress(() => this.openApiTreeProvider.setDescriptionUrl(deepLinkParams.descriptionurl!));
+        await openTreeViewWithProgress(async () => {
+          await this.openApiTreeProvider.setDescriptionUrl(deepLinkParams.descriptionurl!);
+          await updateTreeViewIcons(treeViewId, true, false);
+        });
         return;
       }
     }