fixes microsoft#89491

isidorn · isidorn · commit 24a0699f9766 · 2020-01-29T12:05:00.000+01:00
diff --git a/src/vs/workbench/contrib/debug/common/debugUtils.ts b/src/vs/workbench/contrib/debug/common/debugUtils.ts
@@ -246,6 +246,9 @@ export function getVisibleAndSorted<T extends { presentation?: IConfigPresentati
 			return -1;
 		}
 		if (!first.presentation.group) {
+			if (!second.presentation.group) {
+				return compareOrders(first.presentation.order, second.presentation.order);
+			}
 			return 1;
 		}
 		if (!second.presentation.group) {
@@ -254,13 +257,18 @@ export function getVisibleAndSorted<T extends { presentation?: IConfigPresentati
 		if (first.presentation.group !== second.presentation.group) {
 			return first.presentation.group.localeCompare(second.presentation.group);
 		}
-		if (typeof first.presentation.order !== 'number') {
-			return 1;
-		}
-		if (typeof second.presentation.order !== 'number') {
-			return -1;
-		}
 
-		return first.presentation.order - second.presentation.order;
+		return compareOrders(first.presentation.order, second.presentation.order);
 	});
 }
+
+function compareOrders(first: number | undefined, second: number | undefined): number {
+	if (typeof first !== 'number') {
+		return 1;
+	}
+	if (typeof second !== 'number') {
+		return -1;
+	}
+
+	return first - second;
+}
diff --git a/src/vs/workbench/contrib/debug/test/common/debugUtils.test.ts b/src/vs/workbench/contrib/debug/test/common/debugUtils.test.ts
@@ -103,15 +103,34 @@ suite('Debug - Utils', () => {
 				order: 500
 			}
 		});
+		configs.push({
+			type: 'node',
+			request: 'launch',
+			name: 'h',
+			presentation: {
+				order: 700
+			}
+		});
+		configs.push({
+			type: 'node',
+			request: 'launch',
+			name: 'i',
+			presentation: {
+				order: 1000
+			}
+		});
 
 		const sorted = getVisibleAndSorted(configs);
-		assert.equal(sorted.length, 7);
+		assert.equal(sorted.length, 9);
 		assert.equal(sorted[0].name, 'f');
 		assert.equal(sorted[1].name, 'd');
 		assert.equal(sorted[2].name, 'e');
 		assert.equal(sorted[3].name, 'g');
-		assert.equal(sorted[4].name, 'b');
-		assert.equal(sorted[5].name, 'p');
-		assert.equal(sorted[6].name, 'a');
+		assert.equal(sorted[4].name, 'h');
+		assert.equal(sorted[5].name, 'i');
+		assert.equal(sorted[6].name, 'b');
+		assert.equal(sorted[7].name, 'p');
+		assert.equal(sorted[8].name, 'a');
+
 	});
 });
