Remove URI escaping from workspace service. (#2588)

aasimkhan30 · Aasim Khan · web-flow · commit 27cc293fbb93 · 2026-02-19T12:47:23.000-08:00
* Fix URI escaping.

* Removing more escapes.

* Remove local settings configuration

* Updating semantic kernel

---------

Co-authored-by: Aasim Khan &lt;aasimkhan@gmail.com&gt;
diff --git a/Packages.props b/Packages.props
@@ -56,7 +56,7 @@
     <PackageReference Update="SkiaSharp" Version="2.88.6" />
     <PackageReference Update="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" Condition="$([MSBuild]::IsOsPlatform('Linux'))" />
     <PackageReference Update="TextCopy" Version="6.2.1" />
-    <PackageReference Update="Microsoft.SemanticKernel" Version="1.70.0" />
+    <PackageReference Update="Microsoft.SemanticKernel" Version="1.71.0" />
 
     <PackageReference Update="OpenAI" Version="2.8.0" />
     <PackageReference Update="System.ClientModel" Version="1.8.1" />
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
@@ -709,12 +709,8 @@ public async Task DoHandleRebuildIntellisenseNotification(RebuildIntelliSensePar
             {
                 Logger.Verbose("HandleRebuildIntelliSenseNotification");
 
-                // This URI doesn't come in escaped - so if it's a file path with reserved characters (such as %)
-                // then we'll fail to find it since GetFile expects the URI to be a fully-escaped URI as that's
-                // what the document events are sent in as.
-                var escapedOwnerUri = Uri.EscapeDataString(rebuildParams.OwnerUri);
                 // Skip closing this file if the file doesn't exist
-                var scriptFile = this.CurrentWorkspace.GetFile(escapedOwnerUri);
+                var scriptFile = this.CurrentWorkspace.GetFile(rebuildParams.OwnerUri);
                 if (scriptFile == null)
                 {
                     return;
@@ -1070,10 +1066,7 @@ internal async Task PrepopulateCommonMetadata(
         {
             if (scriptInfo.IsConnected)
             {
-                // This URI doesn't come in escaped - so if it's a file path with reserved characters (such as %)
-                // then we'll fail to find it since GetFile expects the URI to be a fully-escaped URI as that's
-                // what the document events are sent in as.
-                var fileUri = Uri.EscapeUriString(info.OwnerUri);
+                var fileUri = info.OwnerUri;
                 var scriptFile = CurrentWorkspace.GetFile(fileUri);
                 if (scriptFile == null)
                 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/NotebookConvert/NotebookConvertService.cs b/src/Microsoft.SqlTools.ServiceLayer/NotebookConvert/NotebookConvertService.cs
@@ -89,11 +89,7 @@ internal async Task HandleConvertNotebookToSqlRequest(ConvertNotebookToSqlParams
 
         internal async Task HandleConvertSqlToNotebookRequest(ConvertSqlToNotebookParams parameters, RequestContext<ConvertSqlToNotebookResult> requestContext)
         {
-            // This URI doesn't come in escaped - so if it's a file path with reserved characters (such as %)
-            // then we'll fail to find it since GetFile expects the URI to be a fully-escaped URI as that's
-            // what the document events are sent in as.
-            var escapedClientUri = Uri.EscapeUriString(parameters.ClientUri);
-            var file = WorkspaceService<SqlToolsSettings>.Instance.Workspace.GetFile(escapedClientUri);
+            var file = WorkspaceService<SqlToolsSettings>.Instance.Workspace.GetFile(parameters.ClientUri);
             // Temporary notebook that we just fill in with the sql until the parsing logic is added
             var result = new ConvertSqlToNotebookResult
             {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs
@@ -1582,20 +1582,16 @@ private async Task SaveResultsHelper(SaveResultsRequestParams saveParams,
         // Internal for testing purposes
         internal string GetSqlText(ExecuteRequestParamsBase request)
         {
-            // This URI doesn't come in escaped - so if it's a file path with reserved characters (such as %)
-            // then we'll fail to find it since GetFile expects the URI to be a fully-escaped URI as that's
-            // what the document events are sent in as.
-            var escapedOwnerUri = Uri.EscapeUriString(request.OwnerUri);
             // If it is a document selection, we'll retrieve the text from the document
             if (request is ExecuteDocumentSelectionParams docRequest)
             {
-                return GetSqlTextFromSelectionData(escapedOwnerUri, docRequest.QuerySelection);
+                return GetSqlTextFromSelectionData(request.OwnerUri, docRequest.QuerySelection);
             }
 
             // If it is a document statement, we'll retrieve the text from the document
             if (request is ExecuteDocumentStatementParams stmtRequest)
             {
-                return GetSqlStatementAtPosition(escapedOwnerUri, stmtRequest.Line, stmtRequest.Column);
+                return GetSqlStatementAtPosition(request.OwnerUri, stmtRequest.Line, stmtRequest.Column);
             }
 
             // If it is an ExecuteStringParams, return the text as is

Original file line number	Diff line number	Diff line change
`@@ -709,12 +709,8 @@ public async Task DoHandleRebuildIntellisenseNotification(RebuildIntelliSensePar`
`709`	`709`	`{`
`710`	`710`	`Logger.Verbose("HandleRebuildIntelliSenseNotification");`
`711`	`711`
`712`		`- // This URI doesn't come in escaped - so if it's a file path with reserved characters (such as %)`
`713`		`- // then we'll fail to find it since GetFile expects the URI to be a fully-escaped URI as that's`
`714`		`- // what the document events are sent in as.`
`715`		`- var escapedOwnerUri = Uri.EscapeDataString(rebuildParams.OwnerUri);`
`716`	`712`	`// Skip closing this file if the file doesn't exist`
`717`		`- var scriptFile = this.CurrentWorkspace.GetFile(escapedOwnerUri);`
	`713`	`+ var scriptFile = this.CurrentWorkspace.GetFile(rebuildParams.OwnerUri);`
`718`	`714`	`if (scriptFile == null)`
`719`	`715`	`{`
`720`	`716`	`return;`
`@@ -1070,10 +1066,7 @@ internal async Task PrepopulateCommonMetadata(`
`1070`	`1066`	`{`
`1071`	`1067`	`if (scriptInfo.IsConnected)`
`1072`	`1068`	`{`
`1073`		`- // This URI doesn't come in escaped - so if it's a file path with reserved characters (such as %)`
`1074`		`- // then we'll fail to find it since GetFile expects the URI to be a fully-escaped URI as that's`
`1075`		`- // what the document events are sent in as.`
`1076`		`- var fileUri = Uri.EscapeUriString(info.OwnerUri);`
	`1069`	`+ var fileUri = info.OwnerUri;`
`1077`	`1070`	`var scriptFile = CurrentWorkspace.GetFile(fileUri);`
`1078`	`1071`	`if (scriptFile == null)`
`1079`	`1072`	`{`
Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,7 @@ internal async Task HandleConvertNotebookToSqlRequest(ConvertNotebookToSqlParams`
`89`	`89`
`90`	`90`	`internal async Task HandleConvertSqlToNotebookRequest(ConvertSqlToNotebookParams parameters, RequestContext<ConvertSqlToNotebookResult> requestContext)`
`91`	`91`	`{`
`92`		`- // This URI doesn't come in escaped - so if it's a file path with reserved characters (such as %)`
`93`		`- // then we'll fail to find it since GetFile expects the URI to be a fully-escaped URI as that's`
`94`		`- // what the document events are sent in as.`
`95`		`- var escapedClientUri = Uri.EscapeUriString(parameters.ClientUri);`
`96`		`- var file = WorkspaceService<SqlToolsSettings>.Instance.Workspace.GetFile(escapedClientUri);`
	`92`	`+ var file = WorkspaceService<SqlToolsSettings>.Instance.Workspace.GetFile(parameters.ClientUri);`
`97`	`93`	`// Temporary notebook that we just fill in with the sql until the parsing logic is added`
`98`	`94`	`var result = new ConvertSqlToNotebookResult`
`99`	`95`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1582,20 +1582,16 @@ private async Task SaveResultsHelper(SaveResultsRequestParams saveParams,`
`1582`	`1582`	`// Internal for testing purposes`
`1583`	`1583`	`internal string GetSqlText(ExecuteRequestParamsBase request)`
`1584`	`1584`	`{`
`1585`		`- // This URI doesn't come in escaped - so if it's a file path with reserved characters (such as %)`
`1586`		`- // then we'll fail to find it since GetFile expects the URI to be a fully-escaped URI as that's`
`1587`		`- // what the document events are sent in as.`
`1588`		`- var escapedOwnerUri = Uri.EscapeUriString(request.OwnerUri);`
`1589`	`1585`	`// If it is a document selection, we'll retrieve the text from the document`
`1590`	`1586`	`if (request is ExecuteDocumentSelectionParams docRequest)`
`1591`	`1587`	`{`
`1592`		`- return GetSqlTextFromSelectionData(escapedOwnerUri, docRequest.QuerySelection);`
	`1588`	`+ return GetSqlTextFromSelectionData(request.OwnerUri, docRequest.QuerySelection);`
`1593`	`1589`	`}`
`1594`	`1590`
`1595`	`1591`	`// If it is a document statement, we'll retrieve the text from the document`
`1596`	`1592`	`if (request is ExecuteDocumentStatementParams stmtRequest)`
`1597`	`1593`	`{`
`1598`		`- return GetSqlStatementAtPosition(escapedOwnerUri, stmtRequest.Line, stmtRequest.Column);`
	`1594`	`+ return GetSqlStatementAtPosition(request.OwnerUri, stmtRequest.Line, stmtRequest.Column);`
`1599`	`1595`	`}`
`1600`	`1596`
`1601`	`1597`	`// If it is an ExecuteStringParams, return the text as is`