Skip to content

Commit f993944

Browse files
author
Akash Satheesan
committed
fix(vscode): fix + enable layering lint
1 parent c9a28aa commit f993944

File tree

9 files changed

+39
-9
lines changed

9 files changed

+39
-9
lines changed

lib/vscode/.eslintignore

+5
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,8 @@
1616
**/extensions/markdown-language-features/notebook-out/**
1717
**/extensions/typescript-basics/test/colorize-fixtures/**
1818
**/extensions/**/dist/**
19+
# These are code-server code symlinks.
20+
src/vs/base/node/proxy_agent.ts
21+
src/vs/ipc.d.ts
22+
src/vs/server/common/util.ts
23+
src/vs/server/node/uriTransformer.ts

lib/vscode/.eslintrc.json

+25-2
Original file line numberDiff line numberDiff line change
@@ -799,17 +799,40 @@
799799
]
800800
},
801801
{
802-
"target": "**/vs/server/**",
802+
"target": "**/vs/server/node/**",
803803
"restrictions": [
804804
"vs/nls",
805805
"**/vs/base/**/{common,node}/**",
806806
"**/vs/base/parts/**/{common,node}/**",
807807
"**/vs/platform/**/{common,node}/**",
808808
"**/vs/workbench/**/{common,node}/**",
809-
"**/vs/server/**",
809+
"**/vs/server/**/{common,node}/**",
810+
"@coder/logger", // NOTE@coder: add logger
810811
"*" // node modules
811812
]
812813
},
814+
{
815+
"target": "**/vs/server/browser/**",
816+
"restrictions": [
817+
"vs/nls",
818+
"**/vs/base/**/{common,browser}/**",
819+
"**/vs/base/parts/**/{common,browser}/**",
820+
"**/vs/platform/**/{common,browser}/**",
821+
"**/vs/workbench/**/{common,browser}/**",
822+
"**/vs/server/**/{common,browser}/**"
823+
]
824+
},
825+
{
826+
"target": "**/vs/server/common/**",
827+
"restrictions": [
828+
"vs/nls",
829+
"**/vs/base/**/common/**",
830+
"**/vs/base/parts/**/common/**",
831+
"**/vs/platform/**/common/**",
832+
"**/vs/workbench/**/common/**",
833+
"**/vs/server/**/common/**"
834+
]
835+
},
813836
{
814837
"target": "**/src/vs/workbench/workbench.common.main.ts",
815838
"restrictions": [

lib/vscode/src/vs/ipc.d.ts

-1
This file was deleted.

lib/vscode/src/vs/server/browser/client.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as path from 'vs/base/common/path';
2-
import { Options } from 'vs/ipc';
2+
import { Options } from 'vs/server/common/ipc';
33
import { localize } from 'vs/nls';
44
import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
55
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../../typings/ipc.d.ts

lib/vscode/src/vs/server/entry.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { field } from '@coder/logger';
22
import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
33
import * as proxyAgent from 'vs/base/node/proxy_agent';
4-
import { CodeServerMessage, VscodeMessage } from 'vs/ipc';
4+
import { CodeServerMessage, VscodeMessage } from 'vs/server/common/ipc';
55
import { logger } from 'vs/server/node/logger';
66
import { enableCustomMarketplace } from 'vs/server/node/marketplace';
77
import { Vscode } from 'vs/server/node/server';
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../code/node/cliProcessMain.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../code/electron-browser/sharedProcess/contrib/logsDataCleaner.ts

lib/vscode/src/vs/server/node/server.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import { Schemas } from 'vs/base/common/network';
77
import { URI } from 'vs/base/common/uri';
88
import { getMachineId } from 'vs/base/node/id';
99
import { ClientConnectionEvent, IPCServer, IServerChannel, ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
10-
import { LogsDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner';
11-
import { main } from 'vs/code/node/cliProcessMain';
12-
import { Query, VscodeOptions, WorkbenchOptions } from 'vs/ipc';
10+
import { LogsDataCleaner } from 'vs/server/node/logsDataCleaner';
11+
import { main } from 'vs/server/node/cliProcessMain';
12+
import { Query, VscodeOptions, WorkbenchOptions } from 'vs/server/common/ipc';
1313
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
1414
import { ConfigurationService } from 'vs/platform/configuration/common/configurationService';
1515
import { ExtensionHostDebugBroadcastChannel } from 'vs/platform/debug/common/extensionHostDebugIpc';
@@ -39,7 +39,7 @@ import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAg
3939
import { IRequestService } from 'vs/platform/request/common/request';
4040
import { RequestChannel } from 'vs/platform/request/common/requestIpc';
4141
import { RequestService } from 'vs/platform/request/node/requestService';
42-
import ErrorTelemetry from 'vs/platform/telemetry/browser/errorTelemetry';
42+
import ErrorTelemetry from 'vs/platform/telemetry/node/errorTelemetry';
4343
import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties';
4444
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
4545
import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogAppender';

0 commit comments

Comments
 (0)