maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix layering rules in workbench services

Browse source
This commit is contained in:
Benjamin Pasero 2017-10-18 11:28:42 +02:00
parent d4b5e8a7cd
commit e6e9092fb6
4 changed files with 44 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/electron-browser/shell.ts
View file

@ -31,7 +31,7 @@ import ErrorTelemetry from 'vs/platform/telemetry/browser/errorTelemetry';
import { ElectronWindow } from 'vs/workbench/electron-browser/window';
import { resolveWorkbenchCommonProperties, getOrCreateMachineId } from 'vs/platform/telemetry/node/workbenchCommonProperties';
import { machineIdIpcChannel } from 'vs/platform/telemetry/node/commonProperties';
import { WorkspaceStats } from 'vs/workbench/services/telemetry/common/workspaceStats';
import { WorkspaceStats } from 'vs/workbench/services/telemetry/node/workspaceStats';
import { IWindowsService, IWindowService, IWindowConfiguration } from 'vs/platform/windows/common/windows';
import { WindowService } from 'vs/platform/windows/electron-browser/windowService';
import { MessageService } from 'vs/workbench/services/message/electron-browser/messageService';

0
src/vs/workbench/services/telemetry/common/workspaceStats.ts → src/vs/workbench/services/telemetry/node/workspaceStats.ts
View file

2
src/vs/workbench/services/telemetry/test/workspaceStats.test.ts
View file

@ -7,7 +7,7 @@
import * as assert from 'assert';
import * as crypto from 'crypto';
import { getDomainsOfRemotes, getRemotes, getHashedRemotes } from 'vs/workbench/services/telemetry/common/workspaceStats';
import { getDomainsOfRemotes, getRemotes, getHashedRemotes } from 'vs/workbench/services/telemetry/node/workspaceStats';
function hash(value: string): string {
return crypto.createHash('sha1').update(value.toString()).digest('hex');

47
tslint.json
View file

@ -348,15 +348,52 @@
]
},
{
"target": "**/vs/workbench/services/**",
"target": "**/vs/workbench/services/**/common/**",
"restrictions": [
"vs/nls",
"vs/css!./**/*",
"**/vs/base/**",
"**/vs/platform/**",
"**/vs/editor/**",
"**/vs/base/**/common/**",
"**/vs/platform/**/common/**",
"**/vs/editor/common/**",
"**/vs/workbench/common/**",
"**/vs/workbench/services/**/common/**"
]
},
{
"target": "**/vs/workbench/services/**/browser/**",
"restrictions": [
"vs/nls",
"vs/css!./**/*",
"**/vs/base/**/{common,browser}/**",
"**/vs/platform/**/{common,browser}/**",
"**/vs/editor/{common,browser}/**",
"**/vs/workbench/{common,browser}/**",
"**/vs/workbench/services/**/{common,browser}/**"
]
},
{
"target": "**/vs/workbench/services/**/node/**",
"restrictions": [
"vs/nls",
"vs/css!./**/*",
"**/vs/base/**/{common,node}/**",
"**/vs/platform/**/{common,node}/**",
"**/vs/editor/{common,node}/**",
"**/vs/workbench/{common,node}/**",
"**/vs/workbench/services/**/{common,node}/**",
"*" // node modules
]
},
{
"target": "**/vs/workbench/services/**/electron-browser/**",
"restrictions": [
"vs/nls",
"vs/css!./**/*",
"**/vs/base/**/{common,browser,node,electron-browser}/**",
"**/vs/platform/**/{common,browser,node,electron-browser}/**",
"**/vs/editor/**/{common,browser,node,electron-browser}/**",
"**/vs/workbench/{common,browser,node,electron-browser,api}/**",
"**/vs/workbench/services/**",
"**/vs/workbench/services/**/{common,browser,node,electron-browser}/**",
"*" // node modules
]
},