Merge pull request #75 from DaGhostman/develop

Release 2.4.0

Author: DaGhostman

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 _[BC]_ Stands for *B*reaking *C*hange
 
+## [2.4.0]
+
+### Added
+
+- [JS/TS] - Show default values for params
+
+### Changes
+
+- [PHP] - Fix nested arrays as default values output
+- [JAVA] - Add handling for arrays default value
+
 ## [2.3.1]
 
 ### Changes

README.md

@@ -27,10 +27,6 @@ come from external library limitations/behavior and will be fixed/normalized ASA
 - Python
 - TypeScript
 
-## Known issues
-
-- Having 2 classes with the exact same name in the exact file but with different namespace will the second one to mirror the first one when the `namespacePosition` configuration is set to `none` (although it might be only applicable to PHP files, others langs might also be affected)
-
 ## Attributions
 
 - Contributors:

assets/code-28px.svg

@@ -2,7 +2,7 @@
     "name": "vs-treeview",
     "displayName": "File Tree View",
     "description": "Tree View extension providing an overview of the main file symbols",
-    "version": "2.3.1",
+    "version": "2.4.0",
     "author": {
         "name": "Dimitar Dimitrov",
         "email": "daghostman.dd@gmail.com"
@@ -35,11 +35,25 @@
     ],
     "main": "./out/extension",
     "contributes": {
+        "keybindings": {
+            "key": "ctrl+alt+t",
+            "when": "editorTextFocus",
+            "command": "workbench.view.extension.symbol-treeview"
+        },
+        "viewsContainers": {
+            "activitybar": [
+                {
+                    "id": "symbol-treeview",
+                    "title": "File Symbol Explorer",
+                    "icon": "assets/code-28px.svg"
+                }
+            ]
+        },
         "views": {
-            "explorer": [
+            "symbol-treeview": [
                 {
                     "id": "tree-outline",
-                    "name": "Tree"
+                    "name": "Symbols"
                 }
             ]
         },

assets/ic_interface_protected_24px.svg

@@ -58,6 +58,7 @@ export class Provider implements vscode.TreeDataProvider<TreeItem> {
             },
             interface: {
                 private: vscode.Uri.file(__dirname + "/../assets/ic_interface_private_24px.svg"),
+                protected: vscode.Uri.file(__dirname + "/../assets/ic_interface_protected_24px.svg"),
                 public: vscode.Uri.file(__dirname + "/../assets/ic_interface_public_24px.svg"),
             },
             list: {

package.json

@@ -172,12 +172,7 @@ export class JavaProvider implements IBaseProvider<vscode.TreeItem> {
                             return undefined;
                         }).filter((po) => po instanceof vscode.Range).pop();
 
-                        const value = p.fragments[0].initializer === null
-                            ? "" : p.fragments[0].initializer.escapedValue ||
-                            ("new" + p.fragments[0].initializer.type.name.identifier +
-                                "(" + p.fragments[0].initializer.arguments.map((a) => {
-                                    return a.escapedValue;
-                                }).join(", ") + ")");
+                        const value = this.getValue(p);
 
                         return {
                             name,
@@ -220,12 +215,7 @@ export class JavaProvider implements IBaseProvider<vscode.TreeItem> {
                             return undefined;
                         }).filter((po) => po instanceof vscode.Range).pop();
 
-                        const value = p.fragments[0].initializer === null
-                            ? "" : p.fragments[0].initializer.escapedValue ||
-                            ("new" + p.fragments[0].initializer.type.name.identifier +
-                                "(" + p.fragments[0].initializer.arguments.map((a) => {
-                                    return a.escapedValue;
-                                }).join(", ") + ")");
+                        const value = this.getValue(p);
 
                         return {
                             name,
@@ -386,4 +376,22 @@ export class JavaProvider implements IBaseProvider<vscode.TreeItem> {
     public getChildren(element?: vscode.TreeItem): Thenable<vscode.TreeItem[]> {
         return Promise.resolve([]);
     }
+
+    private getValue(p): string {
+        if (p.fragments[0].initializer === null) {
+            return "";
+        }
+
+        if (p.fragments[0].initializer.node === "ArrayInitializer") {
+            const v = p.fragments[0].initializer.expressions.map((a) => a.escapedValue).join(", ");
+            return `[${v.length > 32 ? v.substr(0, 32) : v}]`;
+
+        }
+
+        return p.fragments[0].initializer.escapedValue ||
+        ("new" + p.fragments[0].initializer.type.name.identifier +
+            "(" + p.fragments[0].initializer.arguments.map((a) => {
+                return a.escapedValue;
+            }).join(", ") + ")");
+    }
 }

src/provider.ts

@@ -397,7 +397,7 @@ export class PhpProvider implements IBaseProvider<token.BaseItem> {
                     if (x.key === null) {
                         arr.push(x.value.value);
                     } else {
-                        arr.push(`${x.key.value}: ${this.normalizeType(x.value.value)}`);
+                        arr.push(`${x.key.value}: ${x.value.value}`);
                     }
                 }
 

src/providers/java.ts

@@ -317,10 +317,28 @@ export class TypescriptProvider implements IBaseProvider<vscode.TreeItem> {
                 tree.variables = [];
             }
 
+            let v: string = vscode.window.activeTextEditor.document.getText(
+                new vscode.Range(
+                    this.offsetToPosition(dec.start),
+                    this.offsetToPosition(dec.end),
+                ),
+            );
+
+            v = v.substr(v.indexOf("=") + 1)
+                .replace(";", "")
+                .trim();
+
+            v = v.length > 32 ? v.substr(0, 32) + ".." : v;
+            if (v.length === 0) {
+                // well, we need to unset it
+                v = undefined;
+            }
+
             tree.variables.push({
                 name: `${dec.name}`,
                 position: this.generateRangeForSelection(dec.name, dec.start),
                 type: dec.type === undefined ? "any" : dec.type,
+                value: v,
                 visibility: dec.isExported === true ? "public" : "protected",
             } as token.IVariableToken);
         }