ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)

Browse Source 
* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2

* update distro

* fix layering

* update distro

* fix tests
This commit is contained in:
Anthony Dresser
2020-01-22 13:42:37 -08:00
committed by GitHub
parent 977111eb21
commit bd7aac8ee0
895 changed files with 24651 additions and 14520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/platform/contextkey/common/contextkey.ts
View File

@@ -309,10 +309,9 @@ export class ContextKeyEqualsExpr implements ContextKeyExpr {
}
public evaluate(context: IContext): boolean {
/* tslint:disable:triple-equals */
// Intentional ==
// eslint-disable-next-line eqeqeq
return (context.getValue(this.key) == this.value);
/* tslint:enable:triple-equals */
}
public serialize(): string {
@@ -375,10 +374,9 @@ export class ContextKeyNotEqualsExpr implements ContextKeyExpr {
}
public evaluate(context: IContext): boolean {
/* tslint:disable:triple-equals */
// Intentional !=
// eslint-disable-next-line eqeqeq
return (context.getValue(this.key) != this.value);
/* tslint:enable:triple-equals */
}
public serialize(): string {

6
src/vs/platform/contextkey/test/common/contextkey.test.ts
View File

@@ -65,7 +65,6 @@ suite('ContextKeyExpr', () => {
});
test('evaluate', () => {
/* tslint:disable:triple-equals */
let context = createContext({
'a': true,
'b': false,
@@ -78,6 +77,7 @@ suite('ContextKeyExpr', () => {
assert.equal(rules!.evaluate(context), expected, expr);
}
function testBatch(expr: string, value: any): void {
/* eslint-disable eqeqeq */
testExpression(expr, !!value);
testExpression(expr + ' == true', !!value);
testExpression(expr + ' != true', !value);
@@ -92,6 +92,7 @@ suite('ContextKeyExpr', () => {
testExpression(expr + ' >= 10', parseFloat(value) >= 10);
testExpression(expr + ' <= 10', parseFloat(value) <= 10);
//
/* eslint-enable eqeqeq */
}
testBatch('a', true);
@@ -102,9 +103,8 @@ suite('ContextKeyExpr', () => {
testExpression('a && !b', true && !false);
testExpression('a && b', true && false);
testExpression('a && !b && c == 5', true && !false && '5' == '5');
testExpression('a && !b && c == 5', true && !false && '5' === '5');
testExpression('d =~ /e.*/', false);
/* tslint:enable:triple-equals */
// precedence test: false && true || true === true because && is evaluated first
testExpression('b && a || a', true);