[optimize] sort include directories when show it

Author: github0null

src/EIDEProjectExplorer.ts

@@ -87,7 +87,8 @@ import {
     runShellCommand, redirectHost, readGithubRepoFolder, FileCache,
     genGithubHash, md5, toArray, newMarkdownString, newFileTooltipString, FileTooltipInfo, escapeXml,
     readGithubRepoTxtFile, downloadFile, notifyReloadWindow, formatPath, execInternalCommand,
-    copyAndMakeObjectKeysToLowerCase
+    copyAndMakeObjectKeysToLowerCase,
+    sortPaths
 } from './utility';
 import { concatSystemEnvPath, DeleteDir, exeSuffix, kill, osType, DeleteAllChildren } from './Platform';
 import { KeilARMOption, KeilC51Option, KeilParser, KeilRteDependence } from './KeilXmlParser';
@@ -1164,7 +1165,13 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                         const keyList = config.CustomDep_GetEnabledKeys();
 
                         for (const key of keyList) {
-                            const depValues: string[] = (<any>customDep)[key];
+
+                            let depValues: string[] = (<any>customDep)[key];
+
+                            if (key == 'incList' || key == 'libList') { // is path list ?
+                                depValues = sortPaths(depValues.map((val) => project.toRelativePath(val)), '/');
+                            }
+
                             if (Array.isArray(depValues)) {
                                 iList.push(new ProjTreeItem(TreeItemType.DEPENDENCE_GROUP_ARRAY_FIELD, {
                                     value: config.GetDepKeyDesc(key),
@@ -1173,9 +1180,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                                         `- **Count:** \`${depValues.length}\``]),
                                     obj: new ModifiableDepInfo('None', key),
                                     childKey: key,
-                                    child: depValues
-                                        .map((val) => { return project.toRelativePath(val); })
-                                        .sort((val_1, val_2) => { return val_1.length - val_2.length; }),
+                                    child: depValues,
                                     projectIndex: element.val.projectIndex
                                 }));
                             }
@@ -5621,31 +5626,39 @@ export class ProjectExplorer implements CustomConfigurationProvider {
     async showIncludeDir(prjIndex: number) {
 
         const prj = this.dataProvider.GetProjectByIndex(prjIndex);
-        let pickItems: vscode.QuickPickItem[] = [];
+        const pickItems: vscode.QuickPickItem[] = [];
         const includesMap: Map<string, string> = new Map();
 
+        let includes: string[] = [];
+
         // add dependence include paths
         prj.GetConfiguration().getAllDepGroup().forEach((group) => {
             for (const dep of group.depList) {
                 for (const incPath of dep.incList) {
-                    includesMap.set(prj.toRelativePath(incPath), group.groupName);
+                    const repath = prj.toRelativePath(incPath);
+                    includes.push(repath);
+                    includesMap.set(repath, group.groupName);
                 }
             }
         });
 
         // add source include paths
         prj.getSourceIncludeList().forEach((incPath) => {
-            includesMap.set(prj.toRelativePath(incPath), 'source');
+            const repath = prj.toRelativePath(incPath);
+            includes.push(repath);
+            includesMap.set(repath, 'source');
         });
 
-        for (const keyVal of includesMap) {
+        includes = sortPaths(includes, '/');
 
-            const incPath = keyVal[0];
-            const grpName = keyVal[1];
+        for (const repath of includes) {
+
+            const incPath = repath;
+            const grpName = includesMap.get(repath);
 
             let descpLi: string[] = [];
 
-            if (grpName != ProjectConfiguration.CUSTOM_GROUP_NAME) {
+            if (grpName && grpName != ProjectConfiguration.CUSTOM_GROUP_NAME) {
                 descpLi.push(grpName);
             }
 
@@ -5659,15 +5672,6 @@ export class ProjectExplorer implements CustomConfigurationProvider {
             });
         }
 
-        // sort result
-        pickItems = pickItems.sort((i1, i2) => {
-            if (i1.description && i2.description && i1.description != i2.description) {
-                return i1.description.localeCompare(i2.description);
-            } else {
-                return i1.label.length - i2.label.length;
-            }
-        });
-
         const item = await vscode.window.showQuickPick(pickItems, {
             placeHolder: `${pickItems.length} results, click one copy to clipboard`
         });

src/utility.ts

@@ -42,6 +42,34 @@ import { ExeCmd } from '../lib/node-utility/Executable';
 import { GlobalEvent } from './GlobalEvents';
 import { SettingManager } from './SettingManager';
 
+export function sortPaths(pathList: string[], sep?: string): string[] {
+
+    let plist: string[][] = pathList.map(p => p.split(/\\|\//));
+
+    plist = plist.sort((p1, p2) => {
+
+        const minLen = Math.min(p1.length, p2.length);
+
+        for (let i = 0; i < minLen; i++) {
+
+            const e1 = p1[i];
+            const e2 = p2[i];
+
+            if (e1.length != e2.length)
+                return e1.length - e2.length;
+
+            if (e1 == e2)
+                continue;
+
+            return e1.localeCompare(e2);
+        }
+
+        return p1.length - p2.length;
+    });
+
+    return plist.map(pl => pl.join(sep || File.sep));
+}
+
 export function mergeEnv(old_kv: any, new_kv: any, prependPath?: boolean): any {
 
     const pnam = platform.osType() == 'win32' ? 'Path' : 'PATH';