From 97dcd45d563b8028c9bb325320b84b4e2d1fd7d2 Mon Sep 17 00:00:00 2001
From: BoykoAlex <alex.boyko@gmail.com>
Date: Wed, 2 Aug 2023 17:32:55 -0400
Subject: [PATCH] Fix URIs for Win for vscode-spring-boot

---
 vscode-extensions/vscode-spring-boot/lib/Main.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/vscode-extensions/vscode-spring-boot/lib/Main.ts b/vscode-extensions/vscode-spring-boot/lib/Main.ts
index 0bb183209..1a0faa221 100644
--- a/vscode-extensions/vscode-spring-boot/lib/Main.ts
+++ b/vscode-extensions/vscode-spring-boot/lib/Main.ts
@@ -74,16 +74,18 @@ export function activate(context: VSCode.ExtensionContext): Thenable<ExtensionAP
                     * It comes in as "file:///c%3A/Users/ab/spring-petclinic/src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java"
                     * 
                     * While symbols index would have this uri instead:
-                    * - "file:///C%3A/Users/ab/spring-petclinic/src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java"
+                    * - "file:///C:/Users/ab/spring-petclinic/src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java"
                     * 
-                    * i.e. lower vs upper case drive letter  
+                    * i.e. lower vs upper case drive letter and escaped drive colon
                     */
                     if (OS.platform() === "win32" && uri.scheme === 'file') {
                         let uriStr = uri.toString();
                         let idx = 5; // skip through `file:
                         for (; idx < uriStr.length - 1 && uriStr.charAt(idx) === '/'; idx++) {}
                         if (idx < uriStr.length - 1) {
-                            uriStr = `${uriStr.substring(0, idx)}${uriStr.charAt(idx).toUpperCase()}${uriStr.substring(idx + 1)}`
+                            // replace c%3A with C: or c: with C:
+                            const replaceEscapedColon = idx < uriStr.length - 4 && uriStr.substring(idx + 1, idx + 4) === '%3A';
+                            uriStr = `${uriStr.substring(0, idx)}${uriStr.charAt(idx).toUpperCase()}${replaceEscapedColon ? ':' : ''}${uriStr.substring(idx + (replaceEscapedColon ? 4 : 1))}`
                         }
                         return uriStr;
                     }