development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 02:57:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Refactored code to make "WhiteSpace" into "Whitespace"

Browse source
This commit is contained in:
pi1024e 2019-07-20 18:01:09 -04:00
parent 73c6419c66
commit 85d4895587
4 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
extensions/css-language-features/server/src/pathCompletion.ts
View file

@ -144,27 +144,23 @@ const isDir = (p: string) => {
}; };
function pathToReplaceRange(valueBeforeCursor: string, fullValue: string, fullValueRange: Range) { function pathToReplaceRange(valueBeforeCursor: string, fullValue: string, fullValueRange: Range) {
let replaceRange: Range;
const lastIndexOfSlash = valueBeforeCursor.lastIndexOf('/'); const lastIndexOfSlash = valueBeforeCursor.lastIndexOf('/');
if (lastIndexOfSlash === -1) { if (lastIndexOfSlash === -1) {
replaceRange = fullValueRange; return 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 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 { function pathToSuggestion(p: string, replaceRange: Range): CompletionItem {
@ -180,13 +176,14 @@ function pathToSuggestion(p: string, replaceRange: Range): CompletionItem {
command: 'editor.action.triggerSuggest' 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 // Escape https://www.w3.org/TR/CSS1/#url

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

@ -109,14 +109,13 @@ function pathToSuggestion(p: string, valueBeforeCursor: string, fullValue: strin
const valueAfterLastSlash = fullValue.slice(lastIndexOfSlash + 1); const valueAfterLastSlash = fullValue.slice(lastIndexOfSlash + 1);
const startPos = shiftPosition(range.end, -1 - valueAfterLastSlash.length); const startPos = shiftPosition(range.end, -1 - valueAfterLastSlash.length);
// If whitespace exists, replace until it // If whitespace exists, replace until it
const whiteSpaceIndex = valueAfterLastSlash.indexOf(' '); const whitespaceIndex = valueAfterLastSlash.indexOf(' ');
let endPos; if (whitespaceIndex === -1) {
if (whiteSpaceIndex !== -1) { replaceRange = Range.create(startPos, shiftPosition(range.end, -1));
endPos = shiftPosition(startPos, whiteSpaceIndex);
} else { } else {
endPos = shiftPosition(range.end, -1); replaceRange = Range.create(startPos, shiftPosition(startPos, whitespaceIndex));
} }
replaceRange = Range.create(startPos, endPos);
} }
if (isDir) { if (isDir) {

2
src/vs/editor/common/config/commonEditorConfig.ts
View file

@ -904,7 +904,7 @@ const editorConfiguration: IConfigurationNode = {
'enum': ['none', 'boundary', 'selection', 'all'], 'enum': ['none', 'boundary', 'selection', 'all'],
'enumDescriptions': [ '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."), nls.localize('renderWhitespace.selection', "Render whitespace characters only on selected text."),
'' ''
], ],

2
src/vs/editor/contrib/hover/modesContentHover.ts
View file

@ -480,7 +480,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
this._editor.applyFontInfo(markerElement); this._editor.applyFontInfo(markerElement);
const messageElement = dom.append(markerElement, $('span')); const messageElement = dom.append(markerElement, $('span'));
messageElement.style.whiteSpace = 'pre-wrap'; messageElement.style.whitespace = 'pre-wrap';
messageElement.innerText = message; messageElement.innerText = message;
if (source || code) { if (source || code) {