Skip to content

Commit 679f50d

Browse files
committed
get diagnostic ruleset defaults for the playground
1 parent 9f0be60 commit 679f50d

3 files changed

Lines changed: 15 additions & 19 deletions

File tree

packages/browser-pyright/src/browserWorkersHost.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { getDiagnosticRulesets } from 'pyright-internal/common/configOptions';
12
import {
23
Transferable,
34
WorkersHost,
@@ -29,6 +30,7 @@ export class BrowserWorkersHost implements WorkersHost {
2930
type: 'browser/newWorker',
3031
initialData,
3132
port: channel.port1,
33+
diagnosticRulesets: getDiagnosticRulesets(),
3234
},
3335
[channel.port1]
3436
);

packages/pyright-internal/src/common/configOptions.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,6 +1272,17 @@ export function getStrictDiagnosticRuleSet(): DiagnosticRuleSet {
12721272

12731273
export const allTypeCheckingModes = ['off', 'basic', 'standard', 'strict', 'recommended', 'all'] as const;
12741274

1275+
export const getDiagnosticRulesets = () =>
1276+
[...getBooleanDiagnosticRules(true), ...getDiagLevelDiagnosticRules()].map((rule) => ({
1277+
'Diagnostic Rule': rule,
1278+
...Object.fromEntries(
1279+
allTypeCheckingModes.map((typeCheckingMode) => [
1280+
typeCheckingMode,
1281+
ConfigOptions.getDiagnosticRuleSet(typeCheckingMode)[rule],
1282+
])
1283+
),
1284+
}));
1285+
12751286
export function matchFileSpecs(configOptions: ConfigOptions, uri: Uri, isFile = true) {
12761287
for (const includeSpec of configOptions.include) {
12771288
if (FileSpec.matchIncludeFileSpec(includeSpec.regExp, configOptions.exclude, uri, isFile)) {

packages/pyright-internal/src/pyright.ts

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,7 @@ import { convertDiagnostics } from 'pyright-to-gitlab-ci/src/converter';
5050
import path from 'path';
5151
import { BaselineHandler } from './baseline';
5252
import { pluralize } from './common/stringUtils';
53-
import {
54-
allTypeCheckingModes,
55-
ConfigOptions,
56-
getBooleanDiagnosticRules,
57-
getDiagLevelDiagnosticRules,
58-
} from './common/configOptions';
53+
import { getDiagnosticRulesets } from './common/configOptions';
5954

6055
type SeverityLevel = 'error' | 'warning' | 'information';
6156

@@ -203,19 +198,7 @@ async function processArgs(): Promise<ExitStatus> {
203198
return ExitStatus.ParameterError;
204199
}
205200
if (args.printdiagnosticrulesets) {
206-
console.log(
207-
JSON.stringify(
208-
[...getBooleanDiagnosticRules(true), ...getDiagLevelDiagnosticRules()].map((rule) => ({
209-
'Diagnostic Rule': rule,
210-
...Object.fromEntries(
211-
allTypeCheckingModes.map((typeCheckingMode) => [
212-
typeCheckingMode,
213-
ConfigOptions.getDiagnosticRuleSet(typeCheckingMode)[rule],
214-
])
215-
),
216-
}))
217-
)
218-
);
201+
console.log(JSON.stringify(getDiagnosticRulesets()));
219202
return ExitStatus.NoErrors;
220203
}
221204
if (args.help !== undefined) {

0 commit comments

Comments
 (0)