removed trace logging and normalized paths in search tree parent path checking (microsoft#165850)

Author: andreamah

src/vs/workbench/contrib/search/common/searchModel.ts

@@ -24,7 +24,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IFileService, IFileStatWithPartialMetadata } from 'vs/platform/files/common/files';
 import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { ILogService, LogLevel } from 'vs/platform/log/common/log';
 import { IProgress, IProgressStep } from 'vs/platform/progress/common/progress';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { minimapFindMatch, overviewRulerFindMatchForeground } from 'vs/platform/theme/common/colorRegistry';
@@ -853,13 +852,12 @@ export class FolderMatchWorkspaceRoot extends FolderMatchWithResource {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ILabelService labelService: ILabelService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
-		@ILogService private readonly _logService: ILogService,
 	) {
 		super(_resource, _id, _index, _query, _parent, _searchModel, null, replaceService, instantiationService, labelService, uriIdentityService);
 	}
 
-	private uriParent(uri: URI): URI {
-		return this.uriIdentityService.extUri.dirname(uri);
+	private normalizedUriParent(uri: URI): URI {
+		return this.uriIdentityService.extUri.normalizePath(this.uriIdentityService.extUri.dirname(uri));
 	}
 
 	private uriEquals(uri1: URI, ur2: URI): boolean {
@@ -881,24 +879,17 @@ export class FolderMatchWorkspaceRoot extends FolderMatchWithResource {
 		}
 
 		const fileMatchParentParts: URI[] = [];
-		let uri = this.uriParent(rawFileMatch.resource);
+		const normalizedResource = this.uriIdentityService.extUri.normalizePath(this.resource);
+		let uri = this.normalizedUriParent(rawFileMatch.resource);
 
-		const debug: string[] = ['[search model building]'];
-		while (!this.uriEquals(this.resource, uri)) {
+		while (!this.uriEquals(normalizedResource, uri)) {
 			fileMatchParentParts.unshift(uri);
 			const prevUri = uri;
-			uri = this.uriParent(uri);
-			if (this._logService.getLevel() === LogLevel.Trace) {
-				debug.push(`current uri parent ${uri} comparing with ${prevUri}`);
-			}
+			uri = this.normalizedUriParent(uri);
 			if (this.uriEquals(prevUri, uri)) {
-				this._logService.trace(debug.join('\n\n'));
-				throw Error(`${rawFileMatch.resource} is not correctly configured as a child of its ${this.resource}`);
+				throw Error(`${rawFileMatch.resource} is not correctly configured as a child of its ${normalizedResource}`);
 			}
 		}
-		if (this._logService.getLevel() === LogLevel.Trace) {
-			this._logService.trace(debug.join('\n\n'));
-		}
 
 		const root = this.closestRoot ?? this;
 		let parent: FolderMatch = this;