#1385 normalize uri

Author: sumneko

script/file-uri.lua

@@ -92,4 +92,11 @@ function m.split(uri)
     return uri:match('([^:]*):/?/?([^/]*)(.*)')
 end
 
+function m.normalize(uri)
+    if uri == '' then
+        return uri
+    end
+    return m.encode(m.decode(uri))
+end
+
 return m

script/files.lua

@@ -55,6 +55,8 @@ local uriMap = {}
 ---@return uri
 function m.getRealUri(uri)
     local filename = furi.decode(uri)
+    -- normalize uri
+    uri = furi.encode(filename)
     local path = fs.path(filename)
     local suc, exists = pcall(fs.exists, path)
     if not suc or not exists then

script/workspace/workspace.lua

@@ -45,6 +45,7 @@ end
 
 --- 初始化工作区
 function m.create(uri)
+    uri = furi.normalize(uri)
     log.info('Workspace create: ', uri)
     if uri == furi.encode '/'
     or uri == furi.encode(os.getenv 'HOME' or '') then

test/tclient/tests/single-mode.lua

@@ -9,7 +9,7 @@ lclient():start(function (client)
 
     client:notify('textDocument/didOpen', {
         textDocument = {
-            uri = 'file://single-file.lua',
+            uri = 'file:///single-file.lua',
             languageId = 'lua',
             version = 0,
             text = [[
@@ -25,13 +25,13 @@ print(TEST)
     ws.awaitReady()
 
     local locations = client:awaitRequest('textDocument/definition', {
-        textDocument = { uri = 'file://single-file.lua' },
+        textDocument = { uri = 'file:///single-file.lua' },
         position = { line = 1, character = 7 },
     })
 
     assert(util.equal(locations, {
         {
-            uri = 'file://single-file.lua',
+            uri = 'file:///single-file.lua',
             range = {
                 start   = { line = 0, character = 6 },
                 ['end'] = { line = 0, character = 7 },
@@ -40,20 +40,20 @@ print(TEST)
     }))
 
     local locations = client:awaitRequest('textDocument/definition', {
-        textDocument = { uri = 'file://single-file.lua' },
+        textDocument = { uri = 'file:///single-file.lua' },
         position = { line = 1, character = 0 },
     })
 
     assert(#locations > 0)
 
     local locations = client:awaitRequest('textDocument/definition', {
-        textDocument = { uri = 'file://single-file.lua' },
+        textDocument = { uri = 'file:///single-file.lua' },
         position = { line = 3, character = 0 },
     })
 
     assert(util.equal(locations, {
         {
-            uri = 'file://single-file.lua',
+            uri = 'file:///single-file.lua',
             range = {
                 start   = { line = 3, character = 0 },
                 ['end'] = { line = 3, character = 4 },