Merge pull request #77758 from pi1024e/master

Fix for "whiteSpace" typo: Parameter name and word is one command word spelled "whitespace".

extensions/css-language-features/server/src/pathCompletion.ts

@@ -154,10 +154,10 @@ function pathToReplaceRange(valueBeforeCursor: string, fullValue: string, fullVa
 		const valueAfterLastSlash = fullValue.slice(lastIndexOfSlash + 1);
 		const startPos = shiftPosition(fullValueRange.end, -valueAfterLastSlash.length);
 		// If whitespace exists, replace until it
-		const whiteSpaceIndex = valueAfterLastSlash.indexOf(' ');
+		const whitespaceIndex = valueAfterLastSlash.indexOf(' ');
 		let endPos;
-		if (whiteSpaceIndex !== -1) {
-			endPos = shiftPosition(startPos, whiteSpaceIndex);
+		if (whitespaceIndex !== -1) {
+			endPos = shiftPosition(startPos, whitespaceIndex);
 		} else {
 			endPos = fullValueRange.end;
 		}

extensions/emmet/src/abbreviationActions.ts

@@ -84,8 +84,8 @@ function doWrapping(individualLines: boolean, args: any) {
 
 		const firstLineOfSelection = editor.document.lineAt(rangeToReplace.start).text.substr(rangeToReplace.start.character);
 		const matches = firstLineOfSelection.match(/^(\s*)/);
-		const extraWhiteSpaceSelected = matches ? matches[1].length : 0;
-		rangeToReplace = new vscode.Range(rangeToReplace.start.line, rangeToReplace.start.character + extraWhiteSpaceSelected, rangeToReplace.end.line, rangeToReplace.end.character);
+		const extraWhitespaceSelected = matches ? matches[1].length : 0;
+		rangeToReplace = new vscode.Range(rangeToReplace.start.line, rangeToReplace.start.character + extraWhitespaceSelected, rangeToReplace.end.line, rangeToReplace.end.character);
 
 		let textToWrapInPreview: string[];
 		let textToReplace = editor.document.getText(rangeToReplace);
@@ -94,8 +94,8 @@ function doWrapping(individualLines: boolean, args: any) {
 		} else {
 			const wholeFirstLine = editor.document.lineAt(rangeToReplace.start).text;
 			const otherMatches = wholeFirstLine.match(/^(\s*)/);
-			const preceedingWhiteSpace = otherMatches ? otherMatches[1] : '';
-			textToWrapInPreview = rangeToReplace.isSingleLine ? [textToReplace] : ['\n\t' + textToReplace.split('\n' + preceedingWhiteSpace).join('\n\t') + '\n'];
+			const preceedingWhitespace = otherMatches ? otherMatches[1] : '';
+			textToWrapInPreview = rangeToReplace.isSingleLine ? [textToReplace] : ['\n\t' + textToReplace.split('\n' + preceedingWhitespace).join('\n\t') + '\n'];
 		}
 		textToWrapInPreview = textToWrapInPreview.map(e => e.replace(/(\$\d)/g, '\\$1'));
 

extensions/html-language-features/server/src/modes/pathCompletion.ts

@@ -108,11 +108,12 @@ function pathToSuggestion(p: string, valueBeforeCursor: string, fullValue: strin
 		// Find the last slash before cursor, and calculate the start of replace range from there
 		const valueAfterLastSlash = fullValue.slice(lastIndexOfSlash + 1);
 		const startPos = shiftPosition(range.end, -1 - valueAfterLastSlash.length);
-		// If whitespace exists, replace until it
-		const whiteSpaceIndex = valueAfterLastSlash.indexOf(' ');
+
+		// If whitespace exists, replace until there is no more
+		const whitespaceIndex = valueAfterLastSlash.indexOf(' ');
 		let endPos;
-		if (whiteSpaceIndex !== -1) {
-			endPos = shiftPosition(startPos, whiteSpaceIndex);
+		if (whitespaceIndex !== -1) {
+			endPos = shiftPosition(startPos, whitespaceIndex);
 		} else {
 			endPos = shiftPosition(range.end, -1);
 		}

src/vs/base/browser/ui/list/listWidget.ts

@@ -236,7 +236,7 @@ class KeyboardController<T> implements IDisposable {
 		private view: ListView<T>,
 		options: IListOptions<T>
 	) {
-		const multipleSelectionSupport = !(options.multipleSelectionSupport === false);
+		const multipleSelectionSupport = options.multipleSelectionSupport !== false;
 
 		this.openController = options.openController || DefaultOpenController;
 

src/vs/base/browser/ui/list/rangeMap.ts

@@ -190,4 +190,4 @@ export class RangeMap {
 	dispose() {
 		this.groups = null!; // StrictNullOverride: nulling out ok in dispose
 	}
-}
\ No newline at end of file
+}

src/vs/base/common/glob.ts

@@ -334,7 +334,6 @@ function wrapRelativePattern(parsedPattern: ParsedStringPattern, arg2: string |
 		if (!extpath.isEqualOrParent(path, arg2.base)) {
 			return null;
 		}
-
 		return parsedPattern(paths.relative(arg2.base, path), basename);
 	};
 }

src/vs/base/common/json.ts

@@ -374,12 +374,12 @@ export function createScanner(text: string, ignoreTrivia: boolean = false): JSON
 
 		let code = text.charCodeAt(pos);
 		// trivia: whitespace
-		if (isWhiteSpace(code)) {
+		if (isWhitespace(code)) {
 			do {
 				pos++;
 				value += String.fromCharCode(code);
 				code = text.charCodeAt(pos);
-			} while (isWhiteSpace(code));
+			} while (isWhitespace(code));
 
 			return token = SyntaxKind.Trivia;
 		}
@@ -517,7 +517,7 @@ export function createScanner(text: string, ignoreTrivia: boolean = false): JSON
 	}
 
 	function isUnknownContentCharacter(code: CharacterCodes) {
-		if (isWhiteSpace(code) || isLineBreak(code)) {
+		if (isWhitespace(code) || isLineBreak(code)) {
 			return false;
 		}
 		switch (code) {
@@ -555,7 +555,7 @@ export function createScanner(text: string, ignoreTrivia: boolean = false): JSON
 	};
 }
 
-function isWhiteSpace(ch: number): boolean {
+function isWhitespace(ch: number): boolean {
 	return ch === CharacterCodes.space || ch === CharacterCodes.tab || ch === CharacterCodes.verticalTab || ch === CharacterCodes.formFeed ||
 		ch === CharacterCodes.nonBreakingSpace || ch === CharacterCodes.ogham || ch >= CharacterCodes.enQuad && ch <= CharacterCodes.zeroWidthSpace ||
 		ch === CharacterCodes.narrowNoBreakSpace || ch === CharacterCodes.mathematicalSpace || ch === CharacterCodes.ideographicSpace || ch === CharacterCodes.byteOrderMark;

src/vs/editor/common/config/commonEditorConfig.ts

@@ -904,7 +904,7 @@ const editorConfiguration: IConfigurationNode = {
 			'enum': ['none', 'boundary', 'selection', 'all'],
 			'enumDescriptions': [
 				'',
-				nls.localize('renderWhiteSpace.boundary', "Render whitespace characters except for single spaces between words."),
+				nls.localize('renderWhitespace.boundary', "Render whitespace characters except for single spaces between words."),
 				nls.localize('renderWhitespace.selection', "Render whitespace characters only on selected text."),
 				''
 			],

src/vs/editor/contrib/indentation/indentation.ts

@@ -589,13 +589,13 @@ export class AutoIndentOnPaste implements IEditorContribution {
 
 	private shouldIgnoreLine(model: ITextModel, lineNumber: number): boolean {
 		model.forceTokenization(lineNumber);
-		let nonWhiteSpaceColumn = model.getLineFirstNonWhitespaceColumn(lineNumber);
-		if (nonWhiteSpaceColumn === 0) {
+		let nonWhitespaceColumn = model.getLineFirstNonWhitespaceColumn(lineNumber);
+		if (nonWhitespaceColumn === 0) {
 			return true;
 		}
 		let tokens = model.getLineTokens(lineNumber);
 		if (tokens.getCount() > 0) {
-			let firstNonWhitespaceTokenIndex = tokens.findTokenIndexAtOffset(nonWhiteSpaceColumn);
+			let firstNonWhitespaceTokenIndex = tokens.findTokenIndexAtOffset(nonWhitespaceColumn);
 			if (firstNonWhitespaceTokenIndex >= 0 && tokens.getStandardTokenType(firstNonWhitespaceTokenIndex) === StandardTokenType.Comment) {
 				return true;
 			}

src/vs/editor/test/browser/controller/cursorMoveCommand.test.ts

@@ -132,7 +132,7 @@ suite('Cursor move command test', () => {
 	test('move to first non white space character of line from middle', () => {
 		moveTo(thisCursor, 1, 8);
 
-		moveToLineFirstNonWhiteSpaceCharacter(thisCursor);
+		moveToLineFirstNonWhitespaceCharacter(thisCursor);
 
 		cursorEqual(thisCursor, 1, 6);
 	});
@@ -140,7 +140,7 @@ suite('Cursor move command test', () => {
 	test('move to first non white space character of line from first non white space character', () => {
 		moveTo(thisCursor, 1, 6);
 
-		moveToLineFirstNonWhiteSpaceCharacter(thisCursor);
+		moveToLineFirstNonWhitespaceCharacter(thisCursor);
 
 		cursorEqual(thisCursor, 1, 6);
 	});
@@ -148,7 +148,7 @@ suite('Cursor move command test', () => {
 	test('move to first non white space character of line from first character', () => {
 		moveTo(thisCursor, 1, 1);
 
-		moveToLineFirstNonWhiteSpaceCharacter(thisCursor);
+		moveToLineFirstNonWhitespaceCharacter(thisCursor);
 
 		cursorEqual(thisCursor, 1, 6);
 	});
@@ -180,7 +180,7 @@ suite('Cursor move command test', () => {
 	test('move to last non white space character from middle', () => {
 		moveTo(thisCursor, 1, 8);
 
-		moveToLineLastNonWhiteSpaceCharacter(thisCursor);
+		moveToLineLastNonWhitespaceCharacter(thisCursor);
 
 		cursorEqual(thisCursor, 1, 19);
 	});
@@ -188,7 +188,7 @@ suite('Cursor move command test', () => {
 	test('move to last non white space character from last non white space character', () => {
 		moveTo(thisCursor, 1, 19);
 
-		moveToLineLastNonWhiteSpaceCharacter(thisCursor);
+		moveToLineLastNonWhitespaceCharacter(thisCursor);
 
 		cursorEqual(thisCursor, 1, 19);
 	});
@@ -196,7 +196,7 @@ suite('Cursor move command test', () => {
 	test('move to last non white space character from line end', () => {
 		moveTo(thisCursor, 1, 21);
 
-		moveToLineLastNonWhiteSpaceCharacter(thisCursor);
+		moveToLineLastNonWhitespaceCharacter(thisCursor);
 
 		cursorEqual(thisCursor, 1, 19);
 	});
@@ -415,7 +415,7 @@ function moveToLineStart(cursor: Cursor) {
 	move(cursor, { to: CursorMove.RawDirection.WrappedLineStart });
 }
 
-function moveToLineFirstNonWhiteSpaceCharacter(cursor: Cursor) {
+function moveToLineFirstNonWhitespaceCharacter(cursor: Cursor) {
 	move(cursor, { to: CursorMove.RawDirection.WrappedLineFirstNonWhitespaceCharacter });
 }
 
@@ -427,7 +427,7 @@ function moveToLineEnd(cursor: Cursor) {
 	move(cursor, { to: CursorMove.RawDirection.WrappedLineEnd });
 }
 
-function moveToLineLastNonWhiteSpaceCharacter(cursor: Cursor) {
+function moveToLineLastNonWhitespaceCharacter(cursor: Cursor) {
 	move(cursor, { to: CursorMove.RawDirection.WrappedLineLastNonWhitespaceCharacter });
 }