mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-09 01:32:34 -05:00
Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 (#14883)
* Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 * Bump distro * Upgrade GCC to 4.9 due to yarn install errors * Update build image * Fix bootstrap base url * Bump distro * Fix build errors * Update source map file * Disable checkbox for blocking migration issues (#15131) * disable checkbox for blocking issues * wip * disable checkbox fixes * fix strings * Remove duplicate tsec command * Default to off for tab color if settings not present * re-skip failing tests * Fix mocha error * Bump sqlite version & fix notebooks search view * Turn off esbuild warnings * Update esbuild log level * Fix overflowactionbar tests * Fix ts-ignore in dropdown tests * cleanup/fixes * Fix hygiene * Bundle in entire zone.js module * Remove extra constructor param * bump distro for web compile break * bump distro for web compile break v2 * Undo log level change * New distro * Fix integration test scripts * remove the "no yarn.lock changes" workflow * fix scripts v2 * Update unit test scripts * Ensure ads-kerberos2 updates in .vscodeignore * Try fix unit tests * Upload crash reports * remove nogpu * always upload crashes * Use bash script * Consolidate data/ext dir names * Create in tmp directory Co-authored-by: chlafreniere <hichise@gmail.com> Co-authored-by: Christopher Suh <chsuh@microsoft.com> Co-authored-by: chgagnon <chgagnon@microsoft.com>
This commit is contained in:
@@ -100,7 +100,7 @@ suite('TextModelWithTokens', () => {
|
||||
column: column
|
||||
});
|
||||
|
||||
assert.deepEqual(toRelaxedFoundBracket(actual), toRelaxedFoundBracket(currentExpectedBracket), 'findPrevBracket of ' + lineNumber + ', ' + column);
|
||||
assert.deepStrictEqual(toRelaxedFoundBracket(actual), toRelaxedFoundBracket(currentExpectedBracket), 'findPrevBracket of ' + lineNumber + ', ' + column);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -126,7 +126,7 @@ suite('TextModelWithTokens', () => {
|
||||
column: column
|
||||
});
|
||||
|
||||
assert.deepEqual(toRelaxedFoundBracket(actual), toRelaxedFoundBracket(currentExpectedBracket), 'findNextBracket of ' + lineNumber + ', ' + column);
|
||||
assert.deepStrictEqual(toRelaxedFoundBracket(actual), toRelaxedFoundBracket(currentExpectedBracket), 'findNextBracket of ' + lineNumber + ', ' + column);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -148,12 +148,12 @@ suite('TextModelWithTokens', () => {
|
||||
|
||||
function assertIsNotBracket(model: TextModel, lineNumber: number, column: number) {
|
||||
const match = model.matchBracket(new Position(lineNumber, column));
|
||||
assert.equal(match, null, 'is not matching brackets at ' + lineNumber + ', ' + column);
|
||||
assert.strictEqual(match, null, 'is not matching brackets at ' + lineNumber + ', ' + column);
|
||||
}
|
||||
|
||||
function assertIsBracket(model: TextModel, testPosition: Position, expected: [Range, Range]): void {
|
||||
const actual = model.matchBracket(testPosition);
|
||||
assert.deepEqual(actual, expected, 'matches brackets at ' + testPosition);
|
||||
assert.deepStrictEqual(actual, expected, 'matches brackets at ' + testPosition);
|
||||
}
|
||||
|
||||
suite('TextModelWithTokens - bracket matching', () => {
|
||||
@@ -351,7 +351,7 @@ suite('TextModelWithTokens', () => {
|
||||
const tokenizationSupport: ITokenizationSupport = {
|
||||
getInitialState: () => NULL_STATE,
|
||||
tokenize: undefined!,
|
||||
tokenize2: (line, state) => {
|
||||
tokenize2: (line, hasEOL, state) => {
|
||||
switch (line) {
|
||||
case 'function hello() {': {
|
||||
const tokens = new Uint32Array([
|
||||
@@ -399,8 +399,8 @@ suite('TextModelWithTokens', () => {
|
||||
model.forceTokenization(2);
|
||||
model.forceTokenization(3);
|
||||
|
||||
assert.deepEqual(model.matchBracket(new Position(2, 23)), null);
|
||||
assert.deepEqual(model.matchBracket(new Position(2, 20)), null);
|
||||
assert.deepStrictEqual(model.matchBracket(new Position(2, 23)), null);
|
||||
assert.deepStrictEqual(model.matchBracket(new Position(2, 20)), null);
|
||||
|
||||
model.dispose();
|
||||
registration1.dispose();
|
||||
@@ -434,7 +434,7 @@ suite('TextModelWithTokens regression tests', () => {
|
||||
foreground: token.getForeground()
|
||||
};
|
||||
};
|
||||
assert.deepEqual(actual, expected.map(decode));
|
||||
assert.deepStrictEqual(actual, expected.map(decode));
|
||||
}
|
||||
|
||||
let _tokenId = 10;
|
||||
@@ -446,7 +446,7 @@ suite('TextModelWithTokens regression tests', () => {
|
||||
const tokenizationSupport: ITokenizationSupport = {
|
||||
getInitialState: () => NULL_STATE,
|
||||
tokenize: undefined!,
|
||||
tokenize2: (line, state) => {
|
||||
tokenize2: (line, hasEOL, state) => {
|
||||
let myId = ++_tokenId;
|
||||
let tokens = new Uint32Array(2);
|
||||
tokens[0] = 0;
|
||||
@@ -512,7 +512,7 @@ suite('TextModelWithTokens regression tests', () => {
|
||||
].join('\n'), undefined, languageIdentifier);
|
||||
|
||||
let actual = model.matchBracket(new Position(4, 1));
|
||||
assert.deepEqual(actual, [new Range(4, 1, 4, 7), new Range(9, 1, 9, 11)]);
|
||||
assert.deepStrictEqual(actual, [new Range(4, 1, 4, 7), new Range(9, 1, 9, 11)]);
|
||||
|
||||
model.dispose();
|
||||
registration.dispose();
|
||||
@@ -537,7 +537,7 @@ suite('TextModelWithTokens regression tests', () => {
|
||||
].join('\n'), undefined, languageIdentifier);
|
||||
|
||||
let actual = model.matchBracket(new Position(3, 9));
|
||||
assert.deepEqual(actual, [new Range(3, 6, 3, 17), new Range(2, 6, 2, 14)]);
|
||||
assert.deepStrictEqual(actual, [new Range(3, 6, 3, 17), new Range(2, 6, 2, 14)]);
|
||||
|
||||
model.dispose();
|
||||
registration.dispose();
|
||||
@@ -550,7 +550,7 @@ suite('TextModelWithTokens regression tests', () => {
|
||||
const tokenizationSupport: ITokenizationSupport = {
|
||||
getInitialState: () => NULL_STATE,
|
||||
tokenize: undefined!,
|
||||
tokenize2: (line, state) => {
|
||||
tokenize2: (line, hasEOL, state) => {
|
||||
let tokens = new Uint32Array(2);
|
||||
tokens[0] = 0;
|
||||
tokens[1] = (
|
||||
@@ -565,7 +565,7 @@ suite('TextModelWithTokens regression tests', () => {
|
||||
let model = createTextModel('A model with one line', undefined, outerMode);
|
||||
|
||||
model.forceTokenization(1);
|
||||
assert.equal(model.getLanguageIdAtPosition(1, 1), innerMode.id);
|
||||
assert.strictEqual(model.getLanguageIdAtPosition(1, 1), innerMode.id);
|
||||
|
||||
model.dispose();
|
||||
registration.dispose();
|
||||
@@ -586,7 +586,7 @@ suite('TextModel.getLineIndentGuide', () => {
|
||||
actual[line - 1] = [actualIndents[line - 1], activeIndentGuide.startLineNumber, activeIndentGuide.endLineNumber, activeIndentGuide.indent, model.getLineContent(line)];
|
||||
}
|
||||
|
||||
assert.deepEqual(actual, lines);
|
||||
assert.deepStrictEqual(actual, lines);
|
||||
|
||||
model.dispose();
|
||||
}
|
||||
@@ -764,7 +764,7 @@ suite('TextModel.getLineIndentGuide', () => {
|
||||
].join('\n'));
|
||||
|
||||
const actual = model.getActiveIndentGuide(2, 4, 9);
|
||||
assert.deepEqual(actual, { startLineNumber: 2, endLineNumber: 9, indent: 1 });
|
||||
assert.deepStrictEqual(actual, { startLineNumber: 2, endLineNumber: 9, indent: 1 });
|
||||
model.dispose();
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user