diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/keyboardMapperTestUtils.ts b/src/vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts similarity index 95% rename from src/vs/workbench/services/keybinding/test/electron-browser/keyboardMapperTestUtils.ts rename to src/vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts index 5d3f52834c2..742d09e2c3a 100644 --- a/src/vs/workbench/services/keybinding/test/electron-browser/keyboardMapperTestUtils.ts +++ b/src/vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts @@ -51,7 +51,7 @@ export function assertResolveUserBinding(mapper: IKeyboardMapper, parts: (Simple } export function readRawMapping(file: string): Promise { - return Promises.readFile(getPathFromAmdModule(require, `vs/workbench/services/keybinding/test/electron-browser/${file}.js`)).then((buff) => { + return Promises.readFile(getPathFromAmdModule(require, `vs/workbench/services/keybinding/test/node/${file}.js`)).then((buff) => { const contents = buff.toString(); const func = new Function('define', contents); let rawMappings: T | null = null; @@ -63,7 +63,7 @@ export function readRawMapping(file: string): Promise { } export function assertMapping(writeFileIfDifferent: boolean, mapper: IKeyboardMapper, file: string): Promise { - const filePath = path.normalize(getPathFromAmdModule(require, `vs/workbench/services/keybinding/test/electron-browser/${file}`)); + const filePath = path.normalize(getPathFromAmdModule(require, `vs/workbench/services/keybinding/test/node/${file}`)); return Promises.readFile(filePath).then((buff) => { const expected = buff.toString().replace(/\r\n/g, '\n'); diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/linux_de_ch.js b/src/vs/workbench/services/keybinding/test/node/linux_de_ch.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/linux_de_ch.js rename to src/vs/workbench/services/keybinding/test/node/linux_de_ch.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/linux_de_ch.txt b/src/vs/workbench/services/keybinding/test/node/linux_de_ch.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/linux_de_ch.txt rename to src/vs/workbench/services/keybinding/test/node/linux_de_ch.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/linux_en_uk.js b/src/vs/workbench/services/keybinding/test/node/linux_en_uk.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/linux_en_uk.js rename to src/vs/workbench/services/keybinding/test/node/linux_en_uk.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/linux_en_uk.txt b/src/vs/workbench/services/keybinding/test/node/linux_en_uk.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/linux_en_uk.txt rename to src/vs/workbench/services/keybinding/test/node/linux_en_uk.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/linux_en_us.js b/src/vs/workbench/services/keybinding/test/node/linux_en_us.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/linux_en_us.js rename to src/vs/workbench/services/keybinding/test/node/linux_en_us.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/linux_en_us.txt b/src/vs/workbench/services/keybinding/test/node/linux_en_us.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/linux_en_us.txt rename to src/vs/workbench/services/keybinding/test/node/linux_en_us.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/linux_ru.js b/src/vs/workbench/services/keybinding/test/node/linux_ru.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/linux_ru.js rename to src/vs/workbench/services/keybinding/test/node/linux_ru.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/linux_ru.txt b/src/vs/workbench/services/keybinding/test/node/linux_ru.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/linux_ru.txt rename to src/vs/workbench/services/keybinding/test/node/linux_ru.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/macLinuxFallbackKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/node/macLinuxFallbackKeyboardMapper.test.ts similarity index 99% rename from src/vs/workbench/services/keybinding/test/electron-browser/macLinuxFallbackKeyboardMapper.test.ts rename to src/vs/workbench/services/keybinding/test/node/macLinuxFallbackKeyboardMapper.test.ts index b7db656ffd6..649227a8921 100644 --- a/src/vs/workbench/services/keybinding/test/electron-browser/macLinuxFallbackKeyboardMapper.test.ts +++ b/src/vs/workbench/services/keybinding/test/node/macLinuxFallbackKeyboardMapper.test.ts @@ -7,7 +7,7 @@ import { KeyChord, KeyCode, KeyMod, ScanCode } from 'vs/base/common/keyCodes'; import { SimpleKeybinding, createKeybinding, ScanCodeBinding } from 'vs/base/common/keybindings'; import { OperatingSystem } from 'vs/base/common/platform'; import { MacLinuxFallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper'; -import { IResolvedKeybinding, assertResolveKeybinding, assertResolveKeyboardEvent, assertResolveUserBinding } from 'vs/workbench/services/keybinding/test/electron-browser/keyboardMapperTestUtils'; +import { IResolvedKeybinding, assertResolveKeybinding, assertResolveKeyboardEvent, assertResolveUserBinding } from 'vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils'; suite('keyboardMapper - MAC fallback', () => { diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/macLinuxKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts similarity index 99% rename from src/vs/workbench/services/keybinding/test/electron-browser/macLinuxKeyboardMapper.test.ts rename to src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts index a5984fc12e0..5c7c6021539 100644 --- a/src/vs/workbench/services/keybinding/test/electron-browser/macLinuxKeyboardMapper.test.ts +++ b/src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts @@ -10,7 +10,7 @@ import { UserSettingsLabelProvider } from 'vs/base/common/keybindingLabels'; import { OperatingSystem } from 'vs/base/common/platform'; import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding'; import { MacLinuxKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxKeyboardMapper'; -import { IResolvedKeybinding, assertMapping, assertResolveKeybinding, assertResolveKeyboardEvent, assertResolveUserBinding, readRawMapping } from 'vs/workbench/services/keybinding/test/electron-browser/keyboardMapperTestUtils'; +import { IResolvedKeybinding, assertMapping, assertResolveKeybinding, assertResolveKeyboardEvent, assertResolveUserBinding, readRawMapping } from 'vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils'; import { IMacLinuxKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout'; const WRITE_FILE_IF_DIFFERENT = false; diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/mac_de_ch.js b/src/vs/workbench/services/keybinding/test/node/mac_de_ch.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/mac_de_ch.js rename to src/vs/workbench/services/keybinding/test/node/mac_de_ch.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/mac_de_ch.txt b/src/vs/workbench/services/keybinding/test/node/mac_de_ch.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/mac_de_ch.txt rename to src/vs/workbench/services/keybinding/test/node/mac_de_ch.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/mac_en_us.js b/src/vs/workbench/services/keybinding/test/node/mac_en_us.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/mac_en_us.js rename to src/vs/workbench/services/keybinding/test/node/mac_en_us.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/mac_en_us.txt b/src/vs/workbench/services/keybinding/test/node/mac_en_us.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/mac_en_us.txt rename to src/vs/workbench/services/keybinding/test/node/mac_en_us.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/mac_zh_hant.js b/src/vs/workbench/services/keybinding/test/node/mac_zh_hant.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/mac_zh_hant.js rename to src/vs/workbench/services/keybinding/test/node/mac_zh_hant.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/mac_zh_hant.txt b/src/vs/workbench/services/keybinding/test/node/mac_zh_hant.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/mac_zh_hant.txt rename to src/vs/workbench/services/keybinding/test/node/mac_zh_hant.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/mac_zh_hant2.js b/src/vs/workbench/services/keybinding/test/node/mac_zh_hant2.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/mac_zh_hant2.js rename to src/vs/workbench/services/keybinding/test/node/mac_zh_hant2.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/mac_zh_hant2.txt b/src/vs/workbench/services/keybinding/test/node/mac_zh_hant2.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/mac_zh_hant2.txt rename to src/vs/workbench/services/keybinding/test/node/mac_zh_hant2.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/win_de_ch.js b/src/vs/workbench/services/keybinding/test/node/win_de_ch.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/win_de_ch.js rename to src/vs/workbench/services/keybinding/test/node/win_de_ch.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/win_de_ch.txt b/src/vs/workbench/services/keybinding/test/node/win_de_ch.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/win_de_ch.txt rename to src/vs/workbench/services/keybinding/test/node/win_de_ch.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/win_en_us.js b/src/vs/workbench/services/keybinding/test/node/win_en_us.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/win_en_us.js rename to src/vs/workbench/services/keybinding/test/node/win_en_us.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/win_en_us.txt b/src/vs/workbench/services/keybinding/test/node/win_en_us.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/win_en_us.txt rename to src/vs/workbench/services/keybinding/test/node/win_en_us.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/win_por_ptb.js b/src/vs/workbench/services/keybinding/test/node/win_por_ptb.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/win_por_ptb.js rename to src/vs/workbench/services/keybinding/test/node/win_por_ptb.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/win_por_ptb.txt b/src/vs/workbench/services/keybinding/test/node/win_por_ptb.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/win_por_ptb.txt rename to src/vs/workbench/services/keybinding/test/node/win_por_ptb.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/win_ru.js b/src/vs/workbench/services/keybinding/test/node/win_ru.js similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/win_ru.js rename to src/vs/workbench/services/keybinding/test/node/win_ru.js diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/win_ru.txt b/src/vs/workbench/services/keybinding/test/node/win_ru.txt similarity index 100% rename from src/vs/workbench/services/keybinding/test/electron-browser/win_ru.txt rename to src/vs/workbench/services/keybinding/test/node/win_ru.txt diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/windowsKeyboardMapper.test.ts b/src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts similarity index 99% rename from src/vs/workbench/services/keybinding/test/electron-browser/windowsKeyboardMapper.test.ts rename to src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts index f4e3a99adc0..371d9b15f31 100644 --- a/src/vs/workbench/services/keybinding/test/electron-browser/windowsKeyboardMapper.test.ts +++ b/src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts @@ -7,7 +7,7 @@ import { KeyChord, KeyCode, KeyMod, ScanCode } from 'vs/base/common/keyCodes'; import { SimpleKeybinding, createKeybinding, ScanCodeBinding } from 'vs/base/common/keybindings'; import { OperatingSystem } from 'vs/base/common/platform'; import { WindowsKeyboardMapper } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper'; -import { IResolvedKeybinding, assertMapping, assertResolveKeybinding, assertResolveKeyboardEvent, assertResolveUserBinding, readRawMapping } from 'vs/workbench/services/keybinding/test/electron-browser/keyboardMapperTestUtils'; +import { IResolvedKeybinding, assertMapping, assertResolveKeybinding, assertResolveKeyboardEvent, assertResolveUserBinding, readRawMapping } from 'vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils'; import { IWindowsKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout'; const WRITE_FILE_IF_DIFFERENT = false;