Merge pull request #272 from HvyIndustries/feature/improve-suggestion…

…s-performance

v0.3.4 - Improve suggestions performance

README.md

@@ -24,7 +24,10 @@ You can also set `php.suggest.basic` to `false` to disable VS Code's built-in ph
 
 ---
 
-## What's new in v0.3.3 (latest release)
+## What's new in v0.3.4 (latest release)
+- Significant performance improvements when requesting suggestions *(up to 7,500% faster)*
+
+## What's new in v0.3.3
 - Document symbol provider - view top level symbols in the current file
 - Workspace symbol provider - view top level symbols throughout the workspace
 - Performance improvements

client/CHANGELOG.md

@@ -1,4 +1,7 @@
-# v0.3.3 (latest release)
+# v0.3.4 (latest release)
+- Significant performance improvements when requesting suggestions *(up to 7,500% faster)*
+
+# v0.3.3
 - Document symbol provider - view top level symbols in the current file
 - Workspace symbol provider - view top level symbols throughout the workspace
 - Performance improvements

client/README.md

@@ -24,7 +24,10 @@ You can also set `php.suggest.basic` to `false` to disable VS Code's built-in ph
 
 ---
 
-## What's new in v0.3.3 (latest release)
+## What's new in v0.3.4 (latest release)
+- Significant performance improvements when requesting suggestions *(up to 7,500% faster)*
+
+## What's new in v0.3.3
 - Document symbol provider - view top level symbols in the current file
 - Workspace symbol provider - view top level symbols throughout the workspace
 - Performance improvements

client/package.json

@@ -9,7 +9,7 @@
     },
     "icon": "images/php-256.png",
     "license": "MIT",
-    "version": "0.3.3",
+    "version": "0.3.4",
     "publisher": "HvyIndustries",
     "engines": {
         "vscode": "^1.8.0"

client/phpTest/demo/baseInclude.php

@@ -4,3 +4,4 @@
 
 $dbh = new ConnectionDB();
 $dbh->openDbConnection();
+

server/package.json

@@ -1,7 +1,7 @@
 {
     "name": "crane-lang-server",
     "description": "The language server for Crane",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "author": "HVY Industries",
     "license": "MIT",
     "engines": {

server/src/suggestionBuilder.ts

@@ -246,22 +246,14 @@ export class SuggestionBuilder
 
         // Remove duplicated (overwritten) items
         var filtered = [];
+        var cache = {};
 
         for (var i = 0, l = toReturn.length; i < l; i++) {
             var item = toReturn[i];
 
-            var found = false;
-
-            for (var j = 0, sl = filtered.length; j < sl; j++) {
-                var subItem = filtered[j];
-
-                if (subItem.label == item.label) {
-                    found = true;
-                }
-            }
-
-            if (!found) {
+            if (!(item.label in cache)) {
                 filtered.push(item);
+                cache[item.label] = true;
             }
         }
 
@@ -996,20 +988,14 @@ export class SuggestionBuilder
 
         // Remove duplicated (overwritten) items
         var filtered = [];
-        for (var i = 0, l:number = toReturn.length; i < l; i++) {
-            let item = toReturn[i];
+        var cache = {};
 
-            var found = false;
-            for (var j = 0, sl:number = filtered.length; j < sl; j++) {
-                let subItem = filtered[j];
-
-                if (subItem.label == item.label) {
-                    found = true;
-                }
-            }
+        for (var i = 0, l = toReturn.length; i < l; i++) {
+            var item = toReturn[i];
 
-            if (!found) {
+            if (!(item.label in cache)) {
                 filtered.push(item);
+                cache[item.label] = true;
             }
         }
 

server/src/util/Files.ts

@@ -10,39 +10,36 @@ export class Files
 {
     public static getPathFromUri(uri: string) : string
     {
-        var path = uri;
-        path = path.replace("file:///", "");
-        path = path.replace("%3A", ":");
+        uri = uri.replace("file:///", "");
+
+        var decoded = decodeURIComponent(uri);
 
-        // Handle Windows and Unix paths
         switch (process.platform) {
             case 'darwin':
             case 'linux':
-                path = "/" + path;
-                break;
+                return "/" + decoded;
+
             case 'win32':
-                path = path.replace(/\//g, "\\");
-                break;
+                decoded = decoded.replace(/\//g, "\\");
+                return decoded;
         }
-
-        return path;
     }
 
     public static getUriFromPath(path: string) : string
     {
-        path = path.replace(":", "%3A");
         let pathStart = "file://";
 
         // Handle Windows paths with backslashes
-        switch (process.platform) {
-            case 'win32':
-                path = path.replace(/\\/g, "\/");
-                pathStart = "file:///";
-                break;
+        if (process.platform == "win32") {
+            path = path.replace(/\\/g, "\/");
+            pathStart = "file:///";
         }
 
-        path = pathStart + path;
+        let encoded = encodeURI(path);
+
+        // Handle colons specially as encodeURI does not encode them
+        encoded = encoded.replace(":", "%3A");
 
-        return path;
+        return pathStart + encoded;
     }
 }