Fix some strictPropertyInitialization in search, #78168

src/tsconfig.base.json

@@ -11,7 +11,6 @@
 		"strictBindCallApply": true,
 		"strictNullChecks": true,
 		"forceConsistentCasingInFileNames": true,
-		"strictPropertyInitialization": true,
 		"baseUrl": ".",
 		"paths": {
 			"vs/*": [

src/vs/workbench/contrib/search/browser/patternInputWidget.ts

@@ -29,14 +29,14 @@ export class PatternInputWidget extends Widget {
 
 	static OPTION_CHANGE: string = 'optionChange';
 
-	inputFocusTracker: dom.IFocusTracker;
+	inputFocusTracker!: dom.IFocusTracker;
 
 	private width: number;
 	private placeholder: string;
 	private ariaLabel: string;
 
-	private domNode: HTMLElement;
-	protected inputBox: HistoryInputBox;
+	private domNode!: HTMLElement;
+	protected inputBox!: HistoryInputBox;
 
 	private _onSubmit = this._register(new Emitter<boolean>());
 	onSubmit: CommonEvent<boolean> = this._onSubmit.event;
@@ -148,7 +148,7 @@ export class PatternInputWidget extends Widget {
 		this.setInputWidth();
 	}
 
-	protected renderSubcontrols(controlsDiv: HTMLDivElement): void {
+	protected renderSubcontrols(_controlsDiv: HTMLDivElement): void {
 	}
 
 	private onInputKeyUp(keyboardEvent: IKeyboardEvent) {
@@ -174,7 +174,7 @@ export class ExcludePatternInputWidget extends PatternInputWidget {
 		super(parent, contextViewProvider, options, themeService, contextKeyService);
 	}
 
-	private useExcludesAndIgnoreFilesBox: Checkbox;
+	private useExcludesAndIgnoreFilesBox!: Checkbox;
 
 	dispose(): void {
 		super.dispose();
@@ -209,4 +209,4 @@ export class ExcludePatternInputWidget extends PatternInputWidget {
 		controlsDiv.appendChild(this.useExcludesAndIgnoreFilesBox.domNode);
 		super.renderSubcontrols(controlsDiv);
 	}
-}
+}

src/vs/workbench/contrib/search/browser/searchWidget.ts

@@ -58,7 +58,7 @@ class ReplaceAllAction extends Action {
 		return ReplaceAllAction.fgInstance;
 	}
 
-	private _searchWidget: SearchWidget;
+	private _searchWidget: SearchWidget | null = null;
 
 	constructor() {
 		super(ReplaceAllAction.ID, '', 'action-replace-all', false);
@@ -84,25 +84,25 @@ export class SearchWidget extends Widget {
 		return appendKeyBindingLabel(nls.localize('search.action.replaceAll.enabled.label', "Replace All"), kb, keyBindingService2);
 	}
 
-	domNode: HTMLElement;
+	domNode!: HTMLElement;
 
-	searchInput: FindInput;
-	searchInputFocusTracker: dom.IFocusTracker;
+	searchInput!: FindInput;
+	searchInputFocusTracker!: dom.IFocusTracker;
 	private searchInputBoxFocused: IContextKey<boolean>;
 
-	private replaceContainer: HTMLElement;
-	replaceInput: HistoryInputBox;
-	private toggleReplaceButton: Button;
-	private replaceAllAction: ReplaceAllAction;
+	private replaceContainer!: HTMLElement;
+	replaceInput!: HistoryInputBox;
+	private toggleReplaceButton!: Button;
+	private replaceAllAction!: ReplaceAllAction;
 	private replaceActive: IContextKey<boolean>;
-	private replaceActionBar: ActionBar;
-	replaceInputFocusTracker: dom.IFocusTracker;
+	private replaceActionBar!: ActionBar;
+	replaceInputFocusTracker!: dom.IFocusTracker;
 	private replaceInputBoxFocused: IContextKey<boolean>;
 	private _replaceHistoryDelayer: Delayer<void>;
-	private _preserveCase: Checkbox;
+	private _preserveCase!: Checkbox;
 
 	private ignoreGlobalFindBufferOnNextFocus = false;
-	private previousGlobalFindBufferValue: string;
+	private previousGlobalFindBufferValue: string | null = null;
 
 	private _onSearchSubmit = this._register(new Emitter<void>());
 	readonly onSearchSubmit: Event<void> = this._onSearchSubmit.event;

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

@@ -21,14 +21,14 @@ import { SearchModel } from 'vs/workbench/contrib/search/common/searchModel';
 import * as process from 'vs/base/common/process';
 
 const nullEvent = new class {
-	id: number;
-	topic: string;
-	name: string;
-	description: string;
+	id: number = -1;
+	topic!: string;
+	name!: string;
+	description!: string;
 	data: any;
 
-	startTime: Date;
-	stopTime: Date;
+	startTime!: Date;
+	stopTime!: Date;
 
 	stop(): void {
 		return;

src/vs/workbench/services/search/common/search.ts

@@ -517,7 +517,7 @@ export class QueryGlobTester {
 	private _excludeExpression: glob.IExpression;
 	private _parsedExcludeExpression: glob.ParsedExpression;
 
-	private _parsedIncludeExpression: glob.ParsedExpression;
+	private _parsedIncludeExpression: glob.ParsedExpression | null = null;
 
 	constructor(config: ISearchQuery, folderQuery: IFolderQuery) {
 		this._excludeExpression = {

src/vs/workbench/services/search/common/searchExtTypes.ts

@@ -33,8 +33,8 @@ export class Range {
 		this.end = new Position(endLine, endCol);
 	}
 
-	isEmpty: boolean;
-	isSingleLine: boolean;
+	isEmpty = false;
+	isSingleLine = false;
 	contains(positionOrRange: Position | Range): boolean { return false; }
 	isEqual(other: Range): boolean { return false; }
 	intersection(range: Range): Range | undefined { return undefined; }
@@ -410,4 +410,4 @@ export interface FindTextInFilesOptions {
 	 * Number of lines of context to include after each match.
 	 */
 	afterContext?: number;
-}
+}

src/vs/workbench/services/search/common/searchService.ts

@@ -26,7 +26,7 @@ export class SearchService extends Disposable implements ISearchService {
 
 	_serviceBrand: undefined;
 
-	protected diskSearch: ISearchResultProvider;
+	protected diskSearch: ISearchResultProvider | null = null;
 	private readonly fileSearchProviders = new Map<string, ISearchResultProvider>();
 	private readonly textSearchProviders = new Map<string, ISearchResultProvider>();
 

src/vs/workbench/services/search/node/fileSearch.ts

@@ -43,20 +43,20 @@ process.on('exit', () => {
 export class FileWalker {
 	private config: IFileQuery;
 	private filePattern: string;
-	private normalizedFilePatternLowercase: string;
+	private normalizedFilePatternLowercase: string | null = null;
 	private includePattern: glob.ParsedExpression | undefined;
 	private maxResults: number | null;
 	private exists: boolean;
-	private maxFilesize: number | null;
+	private maxFilesize: number | null = null;
 	private isLimitHit: boolean;
 	private resultCount: number;
-	private isCanceled: boolean;
-	private fileWalkSW: StopWatch;
+	private isCanceled = false;
+	private fileWalkSW: StopWatch | null = null;
 	private directoriesWalked: number;
 	private filesWalked: number;
 	private errors: string[];
-	private cmdSW: StopWatch;
-	private cmdResultCount: number;
+	private cmdSW: StopWatch | null = null;
+	private cmdResultCount: number = 0;
 
 	private folderExcludePatterns: Map<string, AbsoluteAndRelativeParsedExpression>;
 	private globalExcludePattern: glob.ParsedExpression | undefined;
@@ -139,8 +139,8 @@ export class FileWalker {
 					rootFolderDone(null, undefined);
 				}
 			});
-		}, (errors, result) => {
-			this.fileWalkSW.stop();
+		}, (errors, _result) => {
+			this.fileWalkSW!.stop();
 			const err = errors ? arrays.coalesce(errors)[0] : null;
 			done(err, this.isLimitHit);
 		});
@@ -318,9 +318,7 @@ export class FileWalker {
 			if (err || last) {
 				onData = () => { };
 
-				if (this.cmdSW) {
-					this.cmdSW.stop();
-				}
+				this.cmdSW!.stop();
 			}
 			cb(err, stdout, last);
 		};
@@ -455,8 +453,8 @@ export class FileWalker {
 
 	getStats(): ISearchEngineStats {
 		return {
-			cmdTime: this.cmdSW && this.cmdSW.elapsed(),
-			fileWalkTime: this.fileWalkSW.elapsed(),
+			cmdTime: this.cmdSW!.elapsed(),
+			fileWalkTime: this.fileWalkSW!.elapsed(),
 			directoriesWalked: this.directoriesWalked,
 			filesWalked: this.filesWalked,
 			cmdResultCount: this.cmdResultCount
@@ -578,7 +576,9 @@ export class FileWalker {
 				return true; // support the all-matching wildcard
 			}
 
-			return strings.fuzzyContains(path, this.normalizedFilePatternLowercase);
+			if (this.normalizedFilePatternLowercase) {
+				return strings.fuzzyContains(path, this.normalizedFilePatternLowercase);
+			}
 		}
 
 		// No patterns means we match all

src/vs/workbench/services/search/node/textSearchManager.ts

@@ -8,7 +8,6 @@ import { mapArrayOrNot } from 'vs/base/common/arrays';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import * as glob from 'vs/base/common/glob';
-import * as resources from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { toCanonicalName } from 'vs/base/node/encoding';
 import * as pfs from 'vs/base/node/pfs';
@@ -17,9 +16,9 @@ import { TextSearchProvider, TextSearchResult, TextSearchMatch, TextSearchComple
 
 export class TextSearchManager {
 
-	private collector: TextSearchResultsCollector;
+	private collector: TextSearchResultsCollector | null = null;
 
-	private isLimitHit: boolean;
+	private isLimitHit = false;
 	private resultCount = 0;
 
 	constructor(private query: ITextQuery, private provider: TextSearchProvider, private _pfs: typeof pfs = pfs) {
@@ -52,7 +51,7 @@ export class TextSearchManager {
 					const newResultSize = this.resultSize(result);
 					this.resultCount += newResultSize;
 					if (newResultSize > 0) {
-						this.collector.add(result, folderIdx);
+						this.collector!.add(result, folderIdx);
 					}
 				}
 			};
@@ -62,7 +61,7 @@ export class TextSearchManager {
 				return this.searchInFolder(fq, r => onResult(r, i), tokenSource.token);
 			})).then(results => {
 				tokenSource.dispose();
-				this.collector.flush();
+				this.collector!.flush();
 
 				const someFolderHitLImit = results.some(result => !!result && !!result.limitHit);
 				resolve({
@@ -198,8 +197,7 @@ function patternInfoToQuery(patternInfo: IPatternInfo): TextSearchQuery {
 export class TextSearchResultsCollector {
 	private _batchedCollector: BatchedCollector<IFileMatch>;
 
-	private _currentFolderIdx: number;
-	private _currentUri: URI;
+	private _currentFolderIdx: number = -1;
 	private _currentFileMatch: IFileMatch | null = null;
 
 	constructor(private _onResult: (result: IFileMatch[]) => void) {
@@ -210,7 +208,7 @@ export class TextSearchResultsCollector {
 		// Collects TextSearchResults into IInternalFileMatches and collates using BatchedCollector.
 		// This is efficient for ripgrep which sends results back one file at a time. It wouldn't be efficient for other search
 		// providers that send results in random order. We could do this step afterwards instead.
-		if (this._currentFileMatch && (this._currentFolderIdx !== folderIdx || !resources.isEqual(this._currentUri, data.uri))) {
+		if (this._currentFileMatch && this._currentFolderIdx !== folderIdx) {
 			this.pushToCollector();
 			this._currentFileMatch = null;
 		}