Fix project order in treeview (#742)

* Fix project order * Add tests for project order
microsoft · Oct 7, 2020 · 80a758d · 80a758d
1 parent 45f6179
commit 80a758d
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/extension/src/tasks/taskUtil.ts b/extension/src/tasks/taskUtil.ts
@@ -240,7 +240,7 @@ function createVSCodeTaskFromGradleTask(
   );
 }
 
-function getVSCodeTasksFromGradleProject(
+export function getVSCodeTasksFromGradleProject(
   taskTerminalsStore: TaskTerminalsStore,
   rootProject: RootProject,
   gradleProject: GradleProject,
@@ -249,7 +249,7 @@ function getVSCodeTasksFromGradleProject(
   let projects: Array<GradleProject> = [gradleProject];
   const vsCodeTasks: vscode.Task[] = [];
   while (projects.length) {
-    const project = projects.pop();
+    const project = projects.shift();
     const gradleTasks: GradleTask[] | void = project!.getTasksList();
     for (const gradleTask of gradleTasks) {
       vsCodeTasks.push(

diff --git a/extension/src/test/unit/taskUtil.test.ts b/extension/src/test/unit/taskUtil.test.ts
@@ -7,7 +7,10 @@ import * as vscode from 'vscode';
 import { GradleBuild, GradleProject, GradleTask } from '../../proto/gradle_pb';
 import { RootProject } from '../../rootProject/RootProject';
 import { TaskTerminalsStore } from '../../stores';
-import { loadTasksForProjectRoots } from '../../tasks/taskUtil';
+import {
+  getVSCodeTasksFromGradleProject,
+  loadTasksForProjectRoots,
+} from '../../tasks/taskUtil';
 import { buildMockClient, getSuiteName } from '../testUtil';
 
 const mockWorkspaceFolder: vscode.WorkspaceFolder = {
@@ -131,4 +134,34 @@ describe(getSuiteName('taskUtil'), () => {
     );
     assert.strictEqual(tasks.length, 255101);
   });
+
+  it('should not change the order of tasks when building vscode tasks from gradle tasks', () => {
+    const subProject1 = new GradleProject();
+    const task1 = new GradleTask();
+    task1.setBuildfile('A');
+    subProject1.setTasksList([task1]);
+
+    const subProject2 = new GradleProject();
+    const task2 = new GradleTask();
+    task2.setBuildfile('B');
+    subProject2.setTasksList([task2]);
+
+    const subProject3 = new GradleProject();
+    const task3 = new GradleTask();
+    task3.setBuildfile('C');
+    subProject3.setTasksList([task3]);
+
+    const gradleProject = new GradleProject();
+    gradleProject.setProjectsList([subProject1, subProject2, subProject3]);
+    const tasks = getVSCodeTasksFromGradleProject(
+      mockTaskTerminalsStore,
+      mockRootProject,
+      gradleProject,
+      mockClient
+    );
+
+    assert.strictEqual(tasks[0].definition.buildFile, 'A');
+    assert.strictEqual(tasks[1].definition.buildFile, 'B');
+    assert.strictEqual(tasks[2].definition.buildFile, 'C');
+  });
 });