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

Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79 (#14050)

Browse Source 
* Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79

* Fix breaks

* Extension management fixes

* Fix breaks in windows bundling

* Fix/skip failing tests

* Update distro

* Add clear to nuget.config

* Add hygiene task

* Bump distro

* Fix hygiene issue

* Add build to hygiene exclusion

* Update distro

* Update hygiene

* Hygiene exclusions

* Update tsconfig

* Bump distro for server breaks

* Update build config

* Update darwin path

* Add done calls to notebook tests

* Skip failing tests

* Disable smoke tests
This commit is contained in:
Karl Burtram
2021-02-09 16:15:05 -08:00
committed by GitHub
parent 6f192f9af5
commit ce612a3d96
1929 changed files with 68012 additions and 34564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,7 +158,7 @@ suite('ContextKeyExpr', () => {
}
t('a', 'b', 'a && b');
t('a || b', 'c', 'a && c || b && c');
t('a || b', 'c || d', 'a && c || b && c || a && d || b && d');
t('a || b', 'c || d', 'a && c || a && d || b && c || b && d');
t('a || b', 'c && d', 'a && c && d || b && c && d');
t('a || b', 'c && d || e', 'a && e || b && e || a && c && d || b && c && d');
});
@@ -177,4 +177,25 @@ suite('ContextKeyExpr', () => {
assert.equal(ainb.evaluate(createContext({ 'a': 'x', 'b': { 'x': true } })), true);
assert.equal(ainb.evaluate(createContext({ 'a': 'prototype', 'b': {} })), false);
});
test('issue #106524: distributing AND should normalize', () => {
const actual = ContextKeyExpr.and(
ContextKeyExpr.or(
ContextKeyExpr.has('a'),
ContextKeyExpr.has('b')
),
ContextKeyExpr.has('c')
);
const expected = ContextKeyExpr.or(
ContextKeyExpr.and(
ContextKeyExpr.has('a'),
ContextKeyExpr.has('c')
),
ContextKeyExpr.and(
ContextKeyExpr.has('b'),
ContextKeyExpr.has('c')
)
);
assert.equal(actual!.equals(expected!), true);
});
});