fix: don't duplicate test gutter icons when ranges expand (microsoft#181279)

Fixes microsoft#176951

Author: connor4312

src/vs/workbench/contrib/testing/browser/testing.contribution.ts

@@ -176,14 +176,14 @@ CommandsRegistry.registerCommand({
 		const fileService = accessor.get(IFileService);
 		const openerService = accessor.get(IOpenerService);
 
-		let { range, uri } = test.item;
+		const { range, uri } = test.item;
 		if (!uri) {
 			return;
 		}
 
 		// If an editor has the file open, there are decorations. Try to adjust the
 		// revealed range to those decorations (#133441).
-		range = accessor.get(ITestingDecorationsService).getDecoratedRangeForTest(uri, extId) || range;
+		const position = accessor.get(ITestingDecorationsService).getDecoratedTestPosition(uri, extId) || range?.getStartPosition();
 
 		accessor.get(ITestExplorerFilterState).reveal.value = extId;
 		accessor.get(ITestingPeekOpener).closeAllPeeks();
@@ -202,8 +202,8 @@ CommandsRegistry.registerCommand({
 			return;
 		}
 
-		await openerService.open(range
-			? uri.with({ fragment: `L${range.startLineNumber}:${range.startColumn}` })
+		await openerService.open(position
+			? uri.with({ fragment: `L${position.lineNumber}:${position.column}` })
 			: uri
 		);
 	}

src/vs/workbench/contrib/testing/browser/testingDecorations.ts

@@ -254,7 +254,7 @@ export class TestingDecorationService extends Disposable implements ITestingDeco
 	}
 
 	/** @inheritdoc */
-	public getDecoratedRangeForTest(resource: URI, testId: string) {
+	public getDecoratedTestPosition(resource: URI, testId: string) {
 		const model = this.modelService.getModel(resource);
 		if (!model) {
 			return undefined;
@@ -265,7 +265,8 @@ export class TestingDecorationService extends Disposable implements ITestingDeco
 			return undefined;
 		}
 
-		return model.getDecorationRange(decoration.id) || undefined;
+		// decoration is collapsed, so the range is meaningless; only position matters.
+		return model.getDecorationRange(decoration.id)?.getStartPosition();
 	}
 
 	private invalidate() {
@@ -512,11 +513,11 @@ export class TestingDecorations extends Disposable implements IEditorContributio
 	}
 }
 
-const firstLineRange = (originalRange: IRange) => ({
+const collapseRange = (originalRange: IRange) => ({
 	startLineNumber: originalRange.startLineNumber,
 	endLineNumber: originalRange.startLineNumber,
-	startColumn: 0,
-	endColumn: Number.MAX_SAFE_INTEGER,
+	startColumn: originalRange.startColumn,
+	endColumn: originalRange.startColumn,
 });
 
 const createRunTestDecoration = (tests: readonly IncrementalTestCollectionItem[], states: readonly (TestResultItem | undefined)[], visible: boolean): IModelDeltaDecoration => {
@@ -526,7 +527,7 @@ const createRunTestDecoration = (tests: readonly IncrementalTestCollectionItem[]
 	}
 
 	if (!visible) {
-		return { range: firstLineRange(range), options: { isWholeLine: true, description: 'run-test-decoration' } };
+		return { range: collapseRange(range), options: { isWholeLine: true, description: 'run-test-decoration' } };
 	}
 
 	let computedState = TestResultState.Unset;
@@ -560,10 +561,10 @@ const createRunTestDecoration = (tests: readonly IncrementalTestCollectionItem[]
 	}
 
 	return {
-		range: firstLineRange(range),
+		range: collapseRange(range),
 		options: {
 			description: 'run-test-decoration',
-			isWholeLine: true,
+			showIfCollapsed: true,
 			get hoverMessage() {
 				if (!hoverMessage) {
 					const building = hoverMessage = new MarkdownString('', true).appendText(hoverMessageParts.join(', ') + '.');

src/vs/workbench/contrib/testing/common/testingDecorations.ts

@@ -7,7 +7,7 @@ import { IAction } from 'vs/base/common/actions';
 import { binarySearch } from 'vs/base/common/arrays';
 import { Event } from 'vs/base/common/event';
 import { URI } from 'vs/base/common/uri';
-import { Range } from 'vs/editor/common/core/range';
+import { Position } from 'vs/editor/common/core/position';
 import { IModelDeltaDecoration } from 'vs/editor/common/model';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ITestMessage } from 'vs/workbench/contrib/testing/common/testTypes';
@@ -40,7 +40,7 @@ export interface ITestingDecorationsService {
 	 * Gets the range where a test ID is displayed, in the given URI.
 	 * Returns undefined if there's no such decoration.
 	 */
-	getDecoratedRangeForTest(resource: URI, testId: string): Range | undefined;
+	getDecoratedTestPosition(resource: URI, testId: string): Position | undefined;
 }
 
 export interface ITestDecoration {