diff --git a/extensions/css-language-features/server/src/pathCompletion.ts b/extensions/css-language-features/server/src/pathCompletion.ts
index 4d988a52da9..cd9f0792795 100644
--- a/extensions/css-language-features/server/src/pathCompletion.ts
+++ b/extensions/css-language-features/server/src/pathCompletion.ts
@@ -144,27 +144,23 @@ const isDir = (p: string) => {
 };
 
 function pathToReplaceRange(valueBeforeCursor: string, fullValue: string, fullValueRange: Range) {
-	let replaceRange: Range;
 	const lastIndexOfSlash = valueBeforeCursor.lastIndexOf('/');
 	if (lastIndexOfSlash === -1) {
-		replaceRange = fullValueRange;
-	} else {
-		// For cases where cursor is in the middle of attribute value, like <script src="./s|rc/test.js">
-		// Find the last slash before cursor, and calculate the start of replace range from there
-		const valueAfterLastSlash = fullValue.slice(lastIndexOfSlash + 1);
-		const startPos = shiftPosition(fullValueRange.end, -valueAfterLastSlash.length);
-		// If whitespace exists, replace until it
-		const whiteSpaceIndex = valueAfterLastSlash.indexOf(' ');
-		let endPos;
-		if (whiteSpaceIndex !== -1) {
-			endPos = shiftPosition(startPos, whiteSpaceIndex);
-		} else {
-			endPos = fullValueRange.end;
-		}
-		replaceRange = Range.create(startPos, endPos);
+		return fullValueRange;
 	}
 
-	return replaceRange;
+	// For cases where cursor is in the middle of attribute value, like <script src="./s|rc/test.js">
+	// Find the last slash before cursor, and calculate the start of replace range from there
+	const valueAfterLastSlash = fullValue.slice(lastIndexOfSlash + 1);
+	const startPos = shiftPosition(fullValueRange.end, -valueAfterLastSlash.length);
+	// If whitespace exists, replace until it
+	const whitespaceIndex = valueAfterLastSlash.indexOf(' ');
+	if (whitespaceIndex === -1) {
+		return Range.create(startPos, shiftPosition(startPos, whitespaceIndex));
+	}
+
+	return Range.create(startPos, fullValueRange.end);
+
 }
 
 function pathToSuggestion(p: string, replaceRange: Range): CompletionItem {
@@ -180,13 +176,14 @@ function pathToSuggestion(p: string, replaceRange: Range): CompletionItem {
 				command: 'editor.action.triggerSuggest'
 			}
 		};
-	} else {
-		return {
-			label: escapePath(p),
-			kind: CompletionItemKind.File,
-			textEdit: TextEdit.replace(replaceRange, escapePath(p))
-		};
 	}
+
+	return {
+		label: escapePath(p),
+		kind: CompletionItemKind.File,
+		textEdit: TextEdit.replace(replaceRange, escapePath(p))
+	};
+
 }
 
 // Escape https://www.w3.org/TR/CSS1/#url
diff --git a/extensions/html-language-features/server/src/modes/pathCompletion.ts b/extensions/html-language-features/server/src/modes/pathCompletion.ts
index 7451fee1d93..8813c3f595b 100644
--- a/extensions/html-language-features/server/src/modes/pathCompletion.ts
+++ b/extensions/html-language-features/server/src/modes/pathCompletion.ts
@@ -109,14 +109,13 @@ function pathToSuggestion(p: string, valueBeforeCursor: string, fullValue: strin
 		const valueAfterLastSlash = fullValue.slice(lastIndexOfSlash + 1);
 		const startPos = shiftPosition(range.end, -1 - valueAfterLastSlash.length);
 		// If whitespace exists, replace until it
-		const whiteSpaceIndex = valueAfterLastSlash.indexOf(' ');
-		let endPos;
-		if (whiteSpaceIndex !== -1) {
-			endPos = shiftPosition(startPos, whiteSpaceIndex);
+		const whitespaceIndex = valueAfterLastSlash.indexOf(' ');
+		if (whitespaceIndex === -1) {
+			replaceRange = Range.create(startPos, shiftPosition(range.end, -1));
+
 		} else {
-			endPos = shiftPosition(range.end, -1);
+			replaceRange = Range.create(startPos, shiftPosition(startPos, whitespaceIndex));
 		}
-		replaceRange = Range.create(startPos, endPos);
 	}
 
 	if (isDir) {
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
index e9fcfe8030a..889384a1748 100644
--- a/src/vs/editor/common/config/commonEditorConfig.ts
+++ b/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."),
 				''
 			],
diff --git a/src/vs/editor/contrib/hover/modesContentHover.ts b/src/vs/editor/contrib/hover/modesContentHover.ts
index 7bc5a7fb022..7ce5b869612 100644
--- a/src/vs/editor/contrib/hover/modesContentHover.ts
+++ b/src/vs/editor/contrib/hover/modesContentHover.ts
@@ -480,7 +480,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 
 		this._editor.applyFontInfo(markerElement);
 		const messageElement = dom.append(markerElement, $('span'));
-		messageElement.style.whiteSpace = 'pre-wrap';
+		messageElement.style.whitespace = 'pre-wrap';
 		messageElement.innerText = message;
 
 		if (source || code) {