Skip to content

Commit d824159

Browse files
jriekenjrieken
committed
Merge branch 'main' into joh/swc
2 parents 17f192d + 5e3e664 commit d824159

File tree

48 files changed

+1267
-767
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1267
-767
lines changed

‎.github/workflows/basic.yml

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
name: Basic checks
22

33
on:
4-
# push:
5-
# branches:
6-
# - main
7-
# - release/*
4+
push:
5+
branches:
6+
- main
87
pull_request:
98
branches:
109
- main
11-
- release/*
1210

1311
jobs:
1412
main:
13+
if: github.ref != 'refs/heads/main'
1514
name: Compilation, Unit and Integration Tests
1615
runs-on: ubuntu-latest
1716
timeout-minutes: 40
@@ -77,6 +76,7 @@ jobs:
7776
run: DISPLAY=:10 ./scripts/test-integration.sh
7877

7978
hygiene:
79+
if: github.ref != 'refs/heads/main'
8080
name: Hygiene and Layering
8181
runs-on: ubuntu-latest
8282
timeout-minutes: 40
@@ -140,3 +140,45 @@ jobs:
140140

141141
- name: Run Trusted Types Checks
142142
run: yarn tsec-compile-check
143+
144+
warm-cache:
145+
name: Warm up node modules cache
146+
if: github.ref == 'refs/heads/main'
147+
runs-on: ubuntu-latest
148+
timeout-minutes: 40
149+
env:
150+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
151+
steps:
152+
- uses: actions/checkout@v3
153+
154+
- uses: actions/setup-node@v3
155+
with:
156+
node-version: 16
157+
158+
- name: Compute node modules cache key
159+
id: nodeModulesCacheKey
160+
run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
161+
- name: Cache node modules
162+
id: cacheNodeModules
163+
uses: actions/cache@v3
164+
with:
165+
path: "**/node_modules"
166+
key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }}
167+
restore-keys: ${{ runner.os }}-cacheNodeModules21-
168+
- name: Get yarn cache directory path
169+
id: yarnCacheDirPath
170+
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
171+
run: echo "::set-output name=dir::$(yarn cache dir)"
172+
- name: Cache yarn directory
173+
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
174+
uses: actions/cache@v3
175+
with:
176+
path: ${{ steps.yarnCacheDirPath.outputs.dir }}
177+
key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
178+
restore-keys: ${{ runner.os }}-yarnCacheDir-
179+
- name: Execute yarn
180+
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
181+
env:
182+
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
183+
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
184+
run: yarn --frozen-lockfile --network-timeout 180000

‎build/gulpfile.vscode.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ const vscodeResources = [
6565
'out-build/vs/base/browser/ui/codicons/codicon/**',
6666
'out-build/vs/base/parts/sandbox/electron-browser/preload.js',
6767
'out-build/vs/platform/environment/node/userDataPath.js',
68-
'out-build/vs/platform/extensions/node/extensionHostStarterWorkerMain.js',
6968
'out-build/vs/workbench/browser/media/*-theme.css',
7069
'out-build/vs/workbench/contrib/debug/**/*.json',
7170
'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',

‎extensions/css-language-features/server/src/cssServer.ts

Lines changed: 23 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import {
99
import { URI } from 'vscode-uri';
1010
import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet, TextDocument, Position, CSSFormatConfiguration } from 'vscode-css-languageservice';
1111
import { getLanguageModelCache } from './languageModelCache';
12-
import { formatError, runSafeAsync } from './utils/runner';
12+
import { runSafeAsync } from './utils/runner';
13+
import { DiagnosticsSupport, registerDiagnosticsPullSupport, registerDiagnosticsPushSupport } from './utils/validation';
1314
import { getDocumentContext } from './utils/documentContext';
1415
import { fetchDataProviders } from './customData';
1516
import { RequestService, getRequestService } from './requests';
@@ -56,6 +57,8 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
5657

5758
let dataProvidersReady: Promise<any> = Promise.resolve();
5859

60+
let diagnosticsSupport: DiagnosticsSupport | undefined;
61+
5962
const languageServices: { [id: string]: LanguageService } = {};
6063

6164
const notReady = () => Promise.reject('Not Ready');
@@ -91,12 +94,20 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
9194
const snippetSupport = !!getClientCapability('textDocument.completion.completionItem.snippetSupport', false);
9295
scopedSettingsSupport = !!getClientCapability('workspace.configuration', false);
9396
foldingRangeLimit = getClientCapability('textDocument.foldingRange.rangeLimit', Number.MAX_VALUE);
97+
9498
formatterMaxNumberOfEdits = initializationOptions?.customCapabilities?.rangeFormatting?.editLimit || Number.MAX_VALUE;
9599

96100
languageServices.css = getCSSLanguageService({ fileSystemProvider: requestService, clientCapabilities: params.capabilities });
97101
languageServices.scss = getSCSSLanguageService({ fileSystemProvider: requestService, clientCapabilities: params.capabilities });
98102
languageServices.less = getLESSLanguageService({ fileSystemProvider: requestService, clientCapabilities: params.capabilities });
99103

104+
const supportsDiagnosticPull = getClientCapability('textDocument.diagnostic', undefined);
105+
if (supportsDiagnosticPull === undefined) {
106+
diagnosticsSupport = registerDiagnosticsPushSupport(documents, connection, runtime, validateTextDocument);
107+
} else {
108+
diagnosticsSupport = registerDiagnosticsPullSupport(documents, connection, runtime, validateTextDocument);
109+
}
110+
100111
const capabilities: ServerCapabilities = {
101112
textDocumentSync: TextDocumentSyncKind.Incremental,
102113
completionProvider: snippetSupport ? { resolveProvider: false, triggerCharacters: ['/', '-', ':'] } : undefined,
@@ -113,6 +124,11 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
113124
colorProvider: {},
114125
foldingRangeProvider: true,
115126
selectionRangeProvider: true,
127+
diagnosticProvider: {
128+
documentSelector: null,
129+
interFileDependencies: false,
130+
workspaceDiagnostics: false
131+
},
116132
documentRangeFormattingProvider: initializationOptions?.provideFormatter === true,
117133
documentFormattingProvider: initializationOptions?.provideFormatter === true,
118134
};
@@ -157,53 +173,16 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
157173
}
158174
// reset all document settings
159175
documentSettings = {};
160-
// Revalidate any open text documents
161-
documents.all().forEach(triggerValidation);
162-
}
163-
164-
const pendingValidationRequests: { [uri: string]: Disposable } = {};
165-
const validationDelayMs = 500;
166-
167-
// The content of a text document has changed. This event is emitted
168-
// when the text document first opened or when its content has changed.
169-
documents.onDidChangeContent(change => {
170-
triggerValidation(change.document);
171-
});
172-
173-
// a document has closed: clear all diagnostics
174-
documents.onDidClose(event => {
175-
cleanPendingValidation(event.document);
176-
connection.sendDiagnostics({ uri: event.document.uri, diagnostics: [] });
177-
});
178-
179-
function cleanPendingValidation(textDocument: TextDocument): void {
180-
const request = pendingValidationRequests[textDocument.uri];
181-
if (request) {
182-
request.dispose();
183-
delete pendingValidationRequests[textDocument.uri];
184-
}
176+
diagnosticsSupport?.requestRefresh();
185177
}
186178

187-
function triggerValidation(textDocument: TextDocument): void {
188-
cleanPendingValidation(textDocument);
189-
pendingValidationRequests[textDocument.uri] = runtime.timer.setTimeout(() => {
190-
delete pendingValidationRequests[textDocument.uri];
191-
validateTextDocument(textDocument);
192-
}, validationDelayMs);
193-
}
194-
195-
function validateTextDocument(textDocument: TextDocument): void {
179+
async function validateTextDocument(textDocument: TextDocument): Promise<Diagnostic[]> {
196180
const settingsPromise = getDocumentSettings(textDocument);
197-
Promise.all([settingsPromise, dataProvidersReady]).then(async ([settings]) => {
198-
const stylesheet = stylesheets.get(textDocument);
199-
const diagnostics = getLanguageService(textDocument).doValidation(textDocument, stylesheet, settings) as Diagnostic[];
200-
// Send the computed diagnostics to VSCode.
201-
connection.sendDiagnostics({ uri: textDocument.uri, diagnostics });
202-
}, e => {
203-
connection.console.error(formatError(`Error while validating ${textDocument.uri}`, e));
204-
});
205-
}
181+
const [settings] = await Promise.all([settingsPromise, dataProvidersReady]);
206182

183+
const stylesheet = stylesheets.get(textDocument);
184+
return getLanguageService(textDocument).doValidation(textDocument, stylesheet, settings);
185+
}
207186

208187
function updateDataProviders(dataPaths: string[]) {
209188
dataProvidersReady = fetchDataProviders(dataPaths, requestService).then(customDataProviders => {

‎extensions/css-language-features/server/src/utils/validation.ts

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
import { CancellationToken, Connection, Diagnostic, Disposable, DocumentDiagnosticParams, DocumentDiagnosticReport, DocumentDiagnosticReportKind, TextDocuments } from 'vscode-languageserver';
7+
import { TextDocument } from 'vscode-css-languageservice';
8+
import { formatError, runSafeAsync } from './runner';
9+
import { RuntimeEnvironment } from '../cssServer';
10+
11+
export type Validator = (textDocument: TextDocument) => Promise<Diagnostic[]>;
12+
export type DiagnosticsSupport = {
13+
dispose(): void;
14+
requestRefresh(): void;
15+
};
16+
17+
export function registerDiagnosticsPushSupport(documents: TextDocuments<TextDocument>, connection: Connection, runtime: RuntimeEnvironment, validate: Validator): DiagnosticsSupport {
18+
19+
const pendingValidationRequests: { [uri: string]: Disposable } = {};
20+
const validationDelayMs = 500;
21+
22+
const disposables: Disposable[] = [];
23+
24+
// The content of a text document has changed. This event is emitted
25+
// when the text document first opened or when its content has changed.
26+
documents.onDidChangeContent(change => {
27+
triggerValidation(change.document);
28+
}, undefined, disposables);
29+
30+
// a document has closed: clear all diagnostics
31+
documents.onDidClose(event => {
32+
cleanPendingValidation(event.document);
33+
connection.sendDiagnostics({ uri: event.document.uri, diagnostics: [] });
34+
}, undefined, disposables);
35+
36+
function cleanPendingValidation(textDocument: TextDocument): void {
37+
const request = pendingValidationRequests[textDocument.uri];
38+
if (request) {
39+
request.dispose();
40+
delete pendingValidationRequests[textDocument.uri];
41+
}
42+
}
43+
44+
function triggerValidation(textDocument: TextDocument): void {
45+
cleanPendingValidation(textDocument);
46+
const request = pendingValidationRequests[textDocument.uri] = runtime.timer.setTimeout(async () => {
47+
if (request === pendingValidationRequests[textDocument.uri]) {
48+
try {
49+
const diagnostics = await validate(textDocument);
50+
if (request === pendingValidationRequests[textDocument.uri]) {
51+
connection.sendDiagnostics({ uri: textDocument.uri, diagnostics });
52+
}
53+
delete pendingValidationRequests[textDocument.uri];
54+
} catch (e) {
55+
connection.console.error(formatError(`Error while validating ${textDocument.uri}`, e));
56+
}
57+
}
58+
}, validationDelayMs);
59+
}
60+
61+
return {
62+
requestRefresh: () => {
63+
documents.all().forEach(triggerValidation);
64+
},
65+
dispose: () => {
66+
disposables.forEach(d => d.dispose());
67+
disposables.length = 0;
68+
const keys = Object.keys(pendingValidationRequests);
69+
for (const key of keys) {
70+
pendingValidationRequests[key].dispose();
71+
delete pendingValidationRequests[key];
72+
}
73+
}
74+
};
75+
}
76+
77+
export function registerDiagnosticsPullSupport(documents: TextDocuments<TextDocument>, connection: Connection, runtime: RuntimeEnvironment, validate: Validator): DiagnosticsSupport {
78+
79+
function newDocumentDiagnosticReport(diagnostics: Diagnostic[]): DocumentDiagnosticReport {
80+
return {
81+
kind: DocumentDiagnosticReportKind.Full,
82+
items: diagnostics
83+
};
84+
}
85+
86+
const registration = connection.languages.diagnostics.on(async (params: DocumentDiagnosticParams, token: CancellationToken) => {
87+
return runSafeAsync(runtime, async () => {
88+
const document = documents.get(params.textDocument.uri);
89+
if (document) {
90+
return newDocumentDiagnosticReport(await validate(document));
91+
}
92+
return newDocumentDiagnosticReport([]);
93+
94+
}, newDocumentDiagnosticReport([]), `Error while computing diagnostics for ${params.textDocument.uri}`, token);
95+
});
96+
97+
function requestRefresh(): void {
98+
connection.languages.diagnostics.refresh();
99+
}
100+
101+
return {
102+
requestRefresh,
103+
dispose: () => {
104+
registration.dispose();
105+
}
106+
};
107+
108+
}

0 commit comments

Comments
 (0)