mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-09 17:52:34 -05:00
Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 * fix config changes * fix strictnull checks
This commit is contained in:
@@ -306,10 +306,10 @@ suite('PieceTreeTextBuffer._toSingleEditOperation', () => {
|
||||
'',
|
||||
'1'
|
||||
], [
|
||||
editOp(1, 1, 1, 3, 0, 2, ['Your']),
|
||||
editOp(1, 4, 1, 4, 3, 0, ['Interesting ']),
|
||||
editOp(2, 3, 2, 6, 16, 3, null)
|
||||
],
|
||||
editOp(1, 1, 1, 3, 0, 2, ['Your']),
|
||||
editOp(1, 4, 1, 4, 3, 0, ['Interesting ']),
|
||||
editOp(2, 3, 2, 6, 16, 3, null)
|
||||
],
|
||||
editOp(1, 1, 2, 6, 0, 19, [
|
||||
'Your Interesting First Line',
|
||||
'\t\t'
|
||||
|
||||
@@ -1312,8 +1312,8 @@ suite('deltaDecorations', () => {
|
||||
endLineNumber: 1,
|
||||
endColumn: 1
|
||||
}, {
|
||||
stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
|
||||
}
|
||||
stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
|
||||
}
|
||||
);
|
||||
});
|
||||
model.changeDecorations((changeAccessor) => {
|
||||
|
||||
@@ -611,25 +611,25 @@ suite('TextModelSearch', () => {
|
||||
});
|
||||
|
||||
test('parseSearchRequest non regex', () => {
|
||||
assertParseSearchResult('foo', false, false, null, new SearchData(/foo/gi, null, null));
|
||||
assertParseSearchResult('foo', false, false, USUAL_WORD_SEPARATORS, new SearchData(/foo/gi, usualWordSeparators, null));
|
||||
assertParseSearchResult('foo', false, true, null, new SearchData(/foo/g, null, 'foo'));
|
||||
assertParseSearchResult('foo', false, true, USUAL_WORD_SEPARATORS, new SearchData(/foo/g, usualWordSeparators, 'foo'));
|
||||
assertParseSearchResult('foo\\n', false, false, null, new SearchData(/foo\\n/gi, null, null));
|
||||
assertParseSearchResult('foo\\\\n', false, false, null, new SearchData(/foo\\\\n/gi, null, null));
|
||||
assertParseSearchResult('foo\\r', false, false, null, new SearchData(/foo\\r/gi, null, null));
|
||||
assertParseSearchResult('foo\\\\r', false, false, null, new SearchData(/foo\\\\r/gi, null, null));
|
||||
assertParseSearchResult('foo', false, false, null, new SearchData(/foo/giu, null, null));
|
||||
assertParseSearchResult('foo', false, false, USUAL_WORD_SEPARATORS, new SearchData(/foo/giu, usualWordSeparators, null));
|
||||
assertParseSearchResult('foo', false, true, null, new SearchData(/foo/gu, null, 'foo'));
|
||||
assertParseSearchResult('foo', false, true, USUAL_WORD_SEPARATORS, new SearchData(/foo/gu, usualWordSeparators, 'foo'));
|
||||
assertParseSearchResult('foo\\n', false, false, null, new SearchData(/foo\\n/giu, null, null));
|
||||
assertParseSearchResult('foo\\\\n', false, false, null, new SearchData(/foo\\\\n/giu, null, null));
|
||||
assertParseSearchResult('foo\\r', false, false, null, new SearchData(/foo\\r/giu, null, null));
|
||||
assertParseSearchResult('foo\\\\r', false, false, null, new SearchData(/foo\\\\r/giu, null, null));
|
||||
});
|
||||
|
||||
test('parseSearchRequest regex', () => {
|
||||
assertParseSearchResult('foo', true, false, null, new SearchData(/foo/gi, null, null));
|
||||
assertParseSearchResult('foo', true, false, USUAL_WORD_SEPARATORS, new SearchData(/foo/gi, usualWordSeparators, null));
|
||||
assertParseSearchResult('foo', true, true, null, new SearchData(/foo/g, null, null));
|
||||
assertParseSearchResult('foo', true, true, USUAL_WORD_SEPARATORS, new SearchData(/foo/g, usualWordSeparators, null));
|
||||
assertParseSearchResult('foo\\n', true, false, null, new SearchData(/foo\n/gim, null, null));
|
||||
assertParseSearchResult('foo\\\\n', true, false, null, new SearchData(/foo\\n/gi, null, null));
|
||||
assertParseSearchResult('foo\\r', true, false, null, new SearchData(/foo\r/gim, null, null));
|
||||
assertParseSearchResult('foo\\\\r', true, false, null, new SearchData(/foo\\r/gi, null, null));
|
||||
assertParseSearchResult('foo', true, false, null, new SearchData(/foo/giu, null, null));
|
||||
assertParseSearchResult('foo', true, false, USUAL_WORD_SEPARATORS, new SearchData(/foo/giu, usualWordSeparators, null));
|
||||
assertParseSearchResult('foo', true, true, null, new SearchData(/foo/gu, null, null));
|
||||
assertParseSearchResult('foo', true, true, USUAL_WORD_SEPARATORS, new SearchData(/foo/gu, usualWordSeparators, null));
|
||||
assertParseSearchResult('foo\\n', true, false, null, new SearchData(/foo\n/gimu, null, null));
|
||||
assertParseSearchResult('foo\\\\n', true, false, null, new SearchData(/foo\\n/giu, null, null));
|
||||
assertParseSearchResult('foo\\r', true, false, null, new SearchData(/foo\r/gimu, null, null));
|
||||
assertParseSearchResult('foo\\\\r', true, false, null, new SearchData(/foo\\r/giu, null, null));
|
||||
});
|
||||
|
||||
test('issue #53415. \W should match line break.', () => {
|
||||
@@ -721,6 +721,20 @@ suite('TextModelSearch', () => {
|
||||
);
|
||||
});
|
||||
|
||||
test('Simple find using unicode escape sequences', () => {
|
||||
assertFindMatches(
|
||||
regularText.join('\n'),
|
||||
'\\u{0066}\\u006f\\u006F', true, false, null,
|
||||
[
|
||||
[1, 14, 1, 17],
|
||||
[1, 44, 1, 47],
|
||||
[2, 22, 2, 25],
|
||||
[2, 48, 2, 51],
|
||||
[4, 59, 4, 62]
|
||||
]
|
||||
);
|
||||
});
|
||||
|
||||
test('isMultilineRegexSource', () => {
|
||||
assert(!isMultilineRegexSource('foo'));
|
||||
assert(!isMultilineRegexSource(''));
|
||||
|
||||
@@ -138,10 +138,10 @@ suite('TextModelWithTokens', () => {
|
||||
testBrackets([
|
||||
'if (a == 3) { return (7 * (a + 5)); }'
|
||||
], [
|
||||
['{', '}'],
|
||||
['[', ']'],
|
||||
['(', ')']
|
||||
]);
|
||||
['{', '}'],
|
||||
['[', ']'],
|
||||
['(', ')']
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user