development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-31 01:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

More small stylistic changes

Browse source
This commit is contained in:
Alex Dima 2018-08-22 11:57:08 +02:00
parent 061f0f5ef4
commit e819408492
3 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/editor/common/controller/cursorCommon.ts
View file

@ -576,3 +576,7 @@ export class CursorColumns {
return column - 1 - (column - 1) % tabSize;
}
}
export function isQuote(ch: string): boolean {
return (ch === '\'' || ch === '"' || ch === '`');
}

4
src/vs/editor/common/controller/cursorDeleteOperations.ts
View file

@ -5,7 +5,7 @@
'use strict';
import { ReplaceCommand } from 'vs/editor/common/commands/replaceCommand';
import { CursorColumns, CursorConfiguration, ICursorSimpleModel, EditOperationResult, EditOperationType } from 'vs/editor/common/controller/cursorCommon';
import { CursorColumns, CursorConfiguration, ICursorSimpleModel, EditOperationResult, EditOperationType, isQuote } from 'vs/editor/common/controller/cursorCommon';
import { Range } from 'vs/editor/common/core/range';
import { Selection } from 'vs/editor/common/core/selection';
import { MoveOperations } from 'vs/editor/common/controller/cursorMoveOperations';
@ -68,7 +68,7 @@ export class DeleteOperations {
return false;
}
if (character === '\'' || character === '"' || character === '`') {
if (isQuote(character)) {
if (config.autoClosingQuotes === 'never') {
return false;
}

37
src/vs/editor/common/controller/cursorTypeOperations.ts
View file

@ -6,7 +6,7 @@
import { onUnexpectedError } from 'vs/base/common/errors';
import { ReplaceCommand, ReplaceCommandWithoutChangingPosition, ReplaceCommandWithOffsetCursorState } from 'vs/editor/common/commands/replaceCommand';
import { CursorColumns, CursorConfiguration, ICursorSimpleModel, EditOperationResult, EditOperationType } from 'vs/editor/common/controller/cursorCommon';
import { CursorColumns, CursorConfiguration, ICursorSimpleModel, EditOperationResult, EditOperationType, isQuote } from 'vs/editor/common/controller/cursorCommon';
import { Range } from 'vs/editor/common/core/range';
import { ICommand } from 'vs/editor/common/editorCommon';
import { ITextModel } from 'vs/editor/common/model';
@ -437,8 +437,7 @@ export class TypeOperations {
}
private static _isAutoClosingCloseCharType(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string): boolean {
const chIsQuote = (ch === '\'' || ch === '"' || ch === '`');
const autoCloseConfig = chIsQuote ? config.autoClosingQuotes : config.autoClosingBrackets;
const autoCloseConfig = isQuote(ch) ? config.autoClosingQuotes : config.autoClosingBrackets;
if (autoCloseConfig === 'never' || !config.autoClosingPairsClose.hasOwnProperty(ch)) {
return false;
@ -514,7 +513,7 @@ export class TypeOperations {
}
private static _isAutoClosingOpenCharType(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string): boolean {
const chIsQuote = (ch === '\'' || ch === '"' || ch === '`');
const chIsQuote = isQuote(ch);
const autoCloseConfig = chIsQuote ? config.autoClosingQuotes : config.autoClosingBrackets;
if (autoCloseConfig === 'never' || !config.autoClosingPairsOpen.hasOwnProperty(ch)) {
@ -547,7 +546,7 @@ export class TypeOperations {
if (characterAfter) {
let isBeforeCloseBrace = TypeOperations._isBeforeClosingBrace(config, ch, characterAfter);
if (!(isBeforeCloseBrace || shouldAutoCloseBefore(characterAfter))) {
if (!isBeforeCloseBrace && !shouldAutoCloseBefore(characterAfter)) {
return false;
}
}
@ -588,17 +587,22 @@ export class TypeOperations {
});
}
private static _isSurroundSelectionType(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string): boolean {
const chIsQuote = (ch === '\'' || ch === '"' || ch === '`');
let autoWrapping = false;
if (chIsQuote && config.autoWrapping === 'quotes' || !chIsQuote && config.autoWrapping === 'brackets' || config.autoWrapping === 'always') {
autoWrapping = true;
private static _shouldSurroundChar(config: CursorConfiguration, ch: string): boolean {
if (isQuote(ch)) {
return (config.autoWrapping === 'quotes' || config.autoWrapping === 'always');
} else {
// Character is a bracket
return (config.autoWrapping === 'brackets' || config.autoWrapping === 'always');
}
}
if (!autoWrapping || !config.surroundingPairs.hasOwnProperty(ch)) {
private static _isSurroundSelectionType(config: CursorConfiguration, model: ITextModel, selections: Selection[], ch: string): boolean {
if (!TypeOperations._shouldSurroundChar(config, ch) || !config.surroundingPairs.hasOwnProperty(ch)) {
return false;
}
const isTypingAQuoteCharacter = isQuote(ch);
for (let i = 0, len = selections.length; i < len; i++) {
const selection = selections[i];
@ -624,9 +628,9 @@ export class TypeOperations {
return false;
}
if (chIsQuote && selection.startLineNumber === selection.endLineNumber && selection.startColumn + 1 === selection.endColumn) {
if (isTypingAQuoteCharacter && selection.startLineNumber === selection.endLineNumber && selection.startColumn + 1 === selection.endColumn) {
const selectionText = model.getValueInRange(selection);
if ((selectionText === '\'' || selectionText === '"' || selectionText === '`')) {
if (isQuote(selectionText)) {
// Typing a quote character on top of another quote character
// => disable surround selection type
return false;
@ -749,7 +753,7 @@ export class TypeOperations {
// As we are not typing in a new character, so we don't need to run `_runAutoClosingCloseCharType`
// Next step, let's try to check if it's an open char.
if (config.autoClosingPairsOpen.hasOwnProperty(ch)) {
if ((ch === '\'' || ch === '"') && position.column > 2) {
if (isQuote(ch) && position.column > 2) {
const wordSeparators = getMapForWordSeparators(config.wordSeparators);
const characterBeforeCode = lineText.charCodeAt(position.column - 3);
const characterBeforeType = wordSeparators.get(characterBeforeCode);
@ -762,9 +766,8 @@ export class TypeOperations {
if (characterAfter) {
let isBeforeCloseBrace = TypeOperations._isBeforeClosingBrace(config, ch, characterAfter);
const chIsQuote = (ch === '\'' || ch === '"' || ch === '`');
let shouldAutoCloseBefore = chIsQuote ? config.shouldAutoCloseBefore.quote : config.shouldAutoCloseBefore.bracket;
if (!(isBeforeCloseBrace || shouldAutoCloseBefore(characterAfter))) {
let shouldAutoCloseBefore = isQuote(ch) ? config.shouldAutoCloseBefore.quote : config.shouldAutoCloseBefore.bracket;
if (!isBeforeCloseBrace && !shouldAutoCloseBefore(characterAfter)) {
continue;
}
}