mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-13 03:28:33 -05:00
Merge VS Code 1.23.1 (#1520)
This commit is contained in:
@@ -6,9 +6,8 @@
|
||||
'use strict';
|
||||
|
||||
import * as assert from 'assert';
|
||||
import labels = require('vs/base/common/labels');
|
||||
import platform = require('vs/base/common/platform');
|
||||
import { getBaseLabel } from 'vs/base/common/labels';
|
||||
import * as labels from 'vs/base/common/labels';
|
||||
import * as platform from 'vs/base/common/platform';
|
||||
|
||||
suite('Labels', () => {
|
||||
test('shorten - windows', () => {
|
||||
@@ -125,9 +124,9 @@ suite('Labels', () => {
|
||||
|
||||
// conditional separator
|
||||
assert.strictEqual(labels.template('Foo${separator}Bar'), 'FooBar');
|
||||
assert.strictEqual(labels.template('Foo${separator}Bar', { separator: { label: ' - ' } }), 'FooBar');
|
||||
assert.strictEqual(labels.template('${separator}Foo${separator}Bar', { value: 'something', separator: { label: ' - ' } }), 'FooBar');
|
||||
assert.strictEqual(labels.template('${value} Foo${separator}Bar', { value: 'something', separator: { label: ' - ' } }), 'something FooBar');
|
||||
assert.strictEqual(labels.template('Foo${separator}Bar', { separator: { label: ' - ' } }), 'Foo - Bar');
|
||||
assert.strictEqual(labels.template('${separator}Foo${separator}Bar', { value: 'something', separator: { label: ' - ' } }), 'Foo - Bar');
|
||||
assert.strictEqual(labels.template('${value} Foo${separator}Bar', { value: 'something', separator: { label: ' - ' } }), 'something Foo - Bar');
|
||||
|
||||
// // real world example (macOS)
|
||||
let t = '${activeEditorShort}${separator}${rootName}';
|
||||
@@ -151,9 +150,9 @@ suite('Labels', () => {
|
||||
return;
|
||||
}
|
||||
|
||||
assert.equal(getBaseLabel('/some/folder/file.txt'), 'file.txt');
|
||||
assert.equal(getBaseLabel('/some/folder'), 'folder');
|
||||
assert.equal(getBaseLabel('/'), '/');
|
||||
assert.equal(labels.getBaseLabel('/some/folder/file.txt'), 'file.txt');
|
||||
assert.equal(labels.getBaseLabel('/some/folder'), 'folder');
|
||||
assert.equal(labels.getBaseLabel('/'), '/');
|
||||
});
|
||||
|
||||
test('getBaseLabel - windows', () => {
|
||||
@@ -162,9 +161,9 @@ suite('Labels', () => {
|
||||
return;
|
||||
}
|
||||
|
||||
assert.equal(getBaseLabel('c:'), 'C:');
|
||||
assert.equal(getBaseLabel('c:\\'), 'C:');
|
||||
assert.equal(getBaseLabel('c:\\some\\folder\\file.txt'), 'file.txt');
|
||||
assert.equal(getBaseLabel('c:\\some\\folder'), 'folder');
|
||||
assert.equal(labels.getBaseLabel('c:'), 'C:');
|
||||
assert.equal(labels.getBaseLabel('c:\\'), 'C:');
|
||||
assert.equal(labels.getBaseLabel('c:\\some\\folder\\file.txt'), 'file.txt');
|
||||
assert.equal(labels.getBaseLabel('c:\\some\\folder'), 'folder');
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user