fix(cdk): address more C9 edge-cases #2662

Author: JadenSimon

src/awsexplorer/localExplorer.ts

@@ -9,6 +9,7 @@ import { cdkNode } from '../cdk/explorer/rootNode'
 import { ResourceTreeDataProvider, TreeNode } from '../shared/treeview/resourceTreeDataProvider'
 import { once } from '../shared/utilities/functionUtils'
 import { AppNode } from '../cdk/explorer/nodes/appNode'
+import { isCloud9 } from '../shared/extensionUtilities'
 
 export interface RootNode extends TreeNode {
     canShow?(): Promise<boolean> | boolean
@@ -55,5 +56,12 @@ export function createLocalExplorerView(): vscode.TreeView<TreeNode> {
     // Legacy CDK behavior. Mostly useful for C9 as they do not have inline buttons.
     view.onDidChangeVisibility(({ visible }) => visible && cdkNode.refresh())
 
+    // Cloud9 will only refresh when refreshing the entire tree
+    if (isCloud9()) {
+        roots.forEach(node => {
+            node.onDidChangeChildren?.(() => treeDataProvider.refresh())
+        })
+    }
+
     return view
 }

src/cdk/explorer/detectCdkProjects.ts

@@ -23,7 +23,7 @@ export async function detectCdkProjects(
 
     projects.forEach(p => results.set(p.cdkJsonUri.toString(), p))
 
-    return Array.from(projects.values())
+    return Array.from(results.values())
 }
 
 async function detectCdkProjectsFromWorkspaceFolder(

src/cdk/explorer/nodes/appNode.ts

@@ -19,7 +19,7 @@ import { createPlaceholderItem } from '../../../shared/treeview/utils'
  * Existence of apps is determined by the presence of `cdk.json` in a workspace folder
  */
 export class AppNode implements TreeNode {
-    public readonly id = this.makeId()
+    public readonly id = this.location.cdkJsonUri.toString()
     public readonly resource = this.location
     public readonly treeItem: vscode.TreeItem
 
@@ -59,12 +59,6 @@ export class AppNode implements TreeNode {
         }
     }
 
-    private makeId() {
-        const rootUri = vscode.Uri.joinPath(this.location.cdkJsonUri, '..')
-
-        return vscode.workspace.asRelativePath(rootUri)
-    }
-
     private createTreeItem() {
         const item = new vscode.TreeItem(this.location.cdkJsonUri, vscode.TreeItemCollapsibleState.Collapsed)
         item.contextValue = 'awsCdkAppNode'

src/test/cdk/detectCdkProjects.test.ts

@@ -85,6 +85,20 @@ describe('detectCdkProjects', function () {
         assert.strictEqual(actual.length, 0)
     })
 
+    it('de-dupes identical projects`', async function () {
+        workspaceFolders.push(workspaceFolders[0])
+
+        try {
+            const cdkJsonUri = vscode.Uri.joinPath(workspaceFolders[0].uri, 'cdk.json')
+            await saveCdkJson(cdkJsonUri.fsPath)
+
+            const actual = await detectCdkProjects(workspaceFolders)
+            assert.strictEqual(actual.length, 1)
+        } finally {
+            workspaceFolders.pop()
+        }
+    })
+
     it('takes into account `output` from cdk.json to build tree.json path', async function () {
         const cdkJsonUri = vscode.Uri.joinPath(workspaceFolders[0].uri, 'cdk.json')
         await writeJSON(cdkJsonUri.fsPath, { app: 'npx ts-node bin/demo-nov7.ts', output: 'build/cdk.out' })

src/test/cdk/explorer/appNode.test.ts

@@ -23,6 +23,12 @@ describe('AppNode', function () {
     const cdkJsonPath = path.join(getTestWorkspaceFolder(), workspaceFolderName, 'cdk.json')
     const treePath = path.join(cdkJsonPath, '..', 'cdk.out', 'tree.json')
 
+    it('uses the `cdk.json` uri as its id', async function () {
+        const testNode = getTestNode()
+
+        assert.strictEqual(testNode.id, vscode.Uri.file(cdkJsonPath).toString())
+    })
+
     it('initializes label and tooltip', async function () {
         const testNode = getTestNode()