Skip to content

Commit

Permalink
ci(lint): auto-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Jun 1, 2024
1 parent 4162ee4 commit 7c71a8d
Show file tree
Hide file tree
Showing 52 changed files with 180 additions and 180 deletions.
10 changes: 5 additions & 5 deletions extensions/vscode/src/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function getCurrentHybridModeStatus(report = false) {
vscode.window.showInformationMessage(
`Hybrid Mode is disabled automatically because there is a potentially incompatible ${[...incompatibleExtensions, ...unknownExtensions].join(', ')} TypeScript plugin installed.`,
'Open Settings',
'Report a false positive',
'Report a false positive'
).then(value => {
if (value === 'Open Settings') {
vscode.commands.executeCommand('workbench.action.openSettings', 'vue.server.hybridMode');
Expand Down Expand Up @@ -142,7 +142,7 @@ function getCurrentHybridModeStatus(report = false) {
vscode.window.showWarningMessage(
`You have explicitly enabled Hybrid Mode, but you have installed known incompatible extensions: ${incompatibleExtensions.join(', ')}. You may want to change vue.server.hybridMode to "auto" to avoid compatibility issues.`,
'Open Settings',
'Report a false positive',
'Report a false positive'
).then(value => {
if (value === 'Open Settings') {
vscode.commands.executeCommand('workbench.action.openSettings', 'vue.server.hybridMode');
Expand All @@ -160,15 +160,15 @@ function getCurrentHybridModeStatus(report = false) {
if (nightly) {
const libPath = path.join(
nightly.extensionPath.replace(/\\/g, '/'),
'node_modules/typescript/lib',
'node_modules/typescript/lib'
);
return getTsVersion(libPath);
}

if (vscode.env.appRoot) {
const libPath = path.join(
vscode.env.appRoot.replace(/\\/g, '/'),
'extensions/node_modules/typescript/lib',
'extensions/node_modules/typescript/lib'
);
return getTsVersion(libPath);
}
Expand Down Expand Up @@ -438,7 +438,7 @@ export function deactivate(): Thenable<any> | undefined {

async function getInitializationOptions(
context: vscode.ExtensionContext,
hybridMode: boolean,
hybridMode: boolean
): Promise<VueInitializationOptions> {
return {
typescript: { tsdk: (await lsp.getTsdk(context)).tsdk },
Expand Down
2 changes: 1 addition & 1 deletion extensions/vscode/src/features/doctor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export async function register(context: vscode.ExtensionContext, client: BaseLan

return content.trim();
}
},
}
));
context.subscriptions.push(vscode.commands.registerCommand('vue.action.doctor', () => {
const doc = vscode.window.activeTextEditor?.document;
Expand Down
2 changes: 1 addition & 1 deletion extensions/vscode/src/nodeClientMain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ try {
'languages:',
`e.name==='typescript-vue-plugin-bundle'?[${config.server.includeLanguages.map(lang => `"${lang}"`).join(',')}]`,
':Array.isArray(e.languages)',
].join(''),
].join('')
);

// VSCode < 1.87.0
Expand Down
8 changes: 4 additions & 4 deletions packages/component-meta/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ export const createComponentMetaChecker = createChecker;
export function createCheckerByJson(
rootPath: string,
json: any,
checkerOptions: MetaCheckerOptions = {},
checkerOptions: MetaCheckerOptions = {}
) {
return createCheckerByJsonConfigBase(
ts,
rootPath,
json,
checkerOptions,
checkerOptions
);
}

export function createChecker(
tsconfig: string,
checkerOptions: MetaCheckerOptions = {},
checkerOptions: MetaCheckerOptions = {}
) {
return createCheckerBase(
ts,
tsconfig,
checkerOptions,
checkerOptions
);
}
28 changes: 14 additions & 14 deletions packages/component-meta/lib/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function createCheckerByJsonConfigBase(
ts: typeof import('typescript'),
rootDir: string,
json: any,
checkerOptions: MetaCheckerOptions = {},
checkerOptions: MetaCheckerOptions = {}
) {
rootDir = rootDir.replace(windowsPathReg, '/');
return createCheckerWorker(
Expand All @@ -40,7 +40,7 @@ export function createCheckerByJsonConfigBase(
export function createCheckerBase(
ts: typeof import('typescript'),
tsconfig: string,
checkerOptions: MetaCheckerOptions = {},
checkerOptions: MetaCheckerOptions = {}
) {
tsconfig = tsconfig.replace(windowsPathReg, '/');
return createCheckerWorker(
Expand All @@ -49,7 +49,7 @@ export function createCheckerBase(
checkerOptions,
path.dirname(tsconfig),
tsconfig + '.global.vue',
tsconfig,
tsconfig
);
}

Expand All @@ -59,7 +59,7 @@ function createCheckerWorker(
checkerOptions: MetaCheckerOptions,
rootPath: string,
globalComponentName: string,
configFileName: string | undefined,
configFileName: string | undefined
) {

/**
Expand Down Expand Up @@ -118,7 +118,7 @@ export function baseCreate(
projectHost: TypeScriptProjectHost,
vueCompilerOptions: vue.VueCompilerOptions,
checkerOptions: MetaCheckerOptions,
globalComponentName: string,
globalComponentName: string
) {
const globalComponentSnapshot = ts.ScriptSnapshot.fromString('<script setup lang="ts"></script>');
const metaSnapshots: Record<string, ts.IScriptSnapshot> = {};
Expand Down Expand Up @@ -155,7 +155,7 @@ export function baseCreate(
() => projectHost.getProjectVersion?.() ?? '',
() => projectHost.getScriptFileNames(),
projectHost.getCompilationSettings(),
vueCompilerOptions,
vueCompilerOptions
);
const language = vue.createLanguage(
[
Expand All @@ -175,7 +175,7 @@ export function baseCreate(
else {
language.scripts.delete(fileName);
}
},
}
);
language.typescript = {
sys: ts.sys,
Expand Down Expand Up @@ -341,7 +341,7 @@ ${vueCompilerOptions.target < 3 ? vue2TypeHelpersCode : typeHelpersCode}
snapshot.getText(0, snapshot.getLength()),
exportName,
printer,
ts,
ts
) : {};

for (const [propName, defaultExp] of Object.entries({
Expand Down Expand Up @@ -433,7 +433,7 @@ ${vueCompilerOptions.target < 3 ? vue2TypeHelpersCode : typeHelpersCode}
function _getExports(
program: ts.Program,
typeChecker: ts.TypeChecker,
componentPath: string,
componentPath: string
) {

const sourceFile = program?.getSourceFile(getMetaFileName(componentPath));
Expand Down Expand Up @@ -479,7 +479,7 @@ function createSchemaResolvers(
symbolNode: ts.Expression,
{ rawType, schema: options, noDeclarations }: MetaCheckerOptions,
ts: typeof import('typescript'),
language: vue.Language<string>,
language: vue.Language<string>
) {
const visited = new Set<ts.Type>();

Expand Down Expand Up @@ -712,7 +712,7 @@ function readVueComponentDefaultProps(
vueSourceFile: vue.VueVirtualCode,
printer: ts.Printer | undefined,
ts: typeof import('typescript'),
vueCompilerOptions: vue.VueCompilerOptions,
vueCompilerOptions: vue.VueCompilerOptions
) {
let result: Record<string, { default?: string, required?: boolean; }> = {};

Expand Down Expand Up @@ -790,7 +790,7 @@ function readTsComponentDefaultProps(
tsFileText: string,
exportName: string,
printer: ts.Printer | undefined,
ts: typeof import('typescript'),
ts: typeof import('typescript')
) {

const ast = ts.createSourceFile('/tmp.' + lang, tsFileText, ts.ScriptTarget.Latest);
Expand Down Expand Up @@ -869,7 +869,7 @@ function resolvePropsOption(
ast: ts.SourceFile,
props: ts.ObjectLiteralExpression,
printer: ts.Printer | undefined,
ts: typeof import('typescript'),
ts: typeof import('typescript')
) {

const result: Record<string, { default?: string, required?: boolean; }> = {};
Expand Down Expand Up @@ -902,7 +902,7 @@ function resolvePropsOption(

function resolveDefaultOptionExpression(
_default: ts.Expression,
ts: typeof import('typescript'),
ts: typeof import('typescript')
) {
if (ts.isArrowFunction(_default)) {
if (ts.isBlock(_default.body)) {
Expand Down
2 changes: 1 addition & 1 deletion packages/language-core/lib/codegen/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export function collectVars(
ts: typeof import('typescript'),
node: ts.Node,
ast: ts.SourceFile,
result: string[],
result: string[]
) {
if (ts.isIdentifier(node)) {
result.push(getNodeText(ts, node, ast));
Expand Down
6 changes: 3 additions & 3 deletions packages/language-core/lib/codegen/script/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export function* generateComponent(
options: ScriptCodegenOptions,
ctx: ScriptCodegenContext,
scriptSetup: NonNullable<Sfc['scriptSetup']>,
scriptSetupRanges: ScriptSetupRanges,
scriptSetupRanges: ScriptSetupRanges
): Generator<Code> {
if (options.sfc.script && options.scriptRanges?.exportDefault && options.scriptRanges.exportDefault.expression.start !== options.scriptRanges.exportDefault.args.start) {
// use defineComponent() from user space code if it exist
Expand Down Expand Up @@ -54,7 +54,7 @@ export function* generateComponentSetupReturns(scriptSetupRanges: ScriptSetupRan

export function* generateScriptOptions(
script: NonNullable<Sfc['script']>,
scriptRanges: ScriptRanges,
scriptRanges: ScriptRanges
): Generator<Code> {
if (scriptRanges.exportDefault?.args) {
yield generateSfcBlockSection(script, scriptRanges.exportDefault.args.start + 1, scriptRanges.exportDefault.args.end - 1, codeFeatures.all);
Expand All @@ -65,7 +65,7 @@ export function* generateScriptSetupOptions(
options: ScriptCodegenOptions,
ctx: ScriptCodegenContext,
scriptSetup: NonNullable<Sfc['scriptSetup']>,
scriptSetupRanges: ScriptSetupRanges,
scriptSetupRanges: ScriptSetupRanges
): Generator<Code> {
const propsCodegens: (() => Generator<Code>)[] = [];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { getTemplateUsageVars } from './template';
export function* generateInternalComponent(
options: ScriptCodegenOptions,
ctx: ScriptCodegenContext,
templateCodegenCtx: TemplateCodegenContext,
templateCodegenCtx: TemplateCodegenContext
): Generator<Code> {
if (options.sfc.scriptSetup && options.scriptSetupRanges) {
yield `const __VLS_internalComponent = (await import('${options.vueCompilerOptions.lib}')).defineComponent({${newLine}`;
Expand Down
10 changes: 5 additions & 5 deletions packages/language-core/lib/codegen/script/scriptSetup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { generateTemplate } from './template';

export function generateScriptSetupImports(
scriptSetup: NonNullable<Sfc['scriptSetup']>,
scriptSetupRanges: ScriptSetupRanges,
scriptSetupRanges: ScriptSetupRanges
): Code {
return [
scriptSetup.content.substring(0, Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset)) + newLine,
Expand All @@ -22,7 +22,7 @@ export function* generateScriptSetup(
options: ScriptCodegenOptions,
ctx: ScriptCodegenContext,
scriptSetup: NonNullable<Sfc['scriptSetup']>,
scriptSetupRanges: ScriptSetupRanges,
scriptSetupRanges: ScriptSetupRanges
): Generator<Code> {
const definePropMirrors = new Map<string, number>();

Expand Down Expand Up @@ -101,7 +101,7 @@ function* generateSetupFunction(
scriptSetup: NonNullable<Sfc['scriptSetup']>,
scriptSetupRanges: ScriptSetupRanges,
syntax: 'return' | 'export default' | undefined,
definePropMirrors: Map<string, number>,
definePropMirrors: Map<string, number>
): Generator<Code> {
const definePropProposalA = scriptSetup.content.trimStart().startsWith('// @experimentalDefinePropProposal=kevinEdition') || options.vueCompilerOptions.experimentalDefinePropProposal === 'kevinEdition';
const definePropProposalB = scriptSetup.content.trimStart().startsWith('// @experimentalDefinePropProposal=johnsonEdition') || options.vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition';
Expand Down Expand Up @@ -268,7 +268,7 @@ function* generateComponentProps(
ctx: ScriptCodegenContext,
scriptSetup: NonNullable<Sfc['scriptSetup']>,
scriptSetupRanges: ScriptSetupRanges,
definePropMirrors: Map<string, number>,
definePropMirrors: Map<string, number>
): Generator<Code> {
yield `const __VLS_fnComponent = `
+ `(await import('${options.vueCompilerOptions.lib}')).defineComponent({${newLine}`;
Expand Down Expand Up @@ -381,7 +381,7 @@ function* generateComponentProps(
function* generateModelEmits(
options: ScriptCodegenOptions,
scriptSetup: NonNullable<Sfc['scriptSetup']>,
scriptSetupRanges: ScriptSetupRanges,
scriptSetupRanges: ScriptSetupRanges
): Generator<Code> {
yield `const __VLS_modelEmitsType = `;

Expand Down
2 changes: 1 addition & 1 deletion packages/language-core/lib/codegen/script/src.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { codeFeatures } from './index';

export function* generateSrc(
script: NonNullable<Sfc['script']>,
src: string,
src: string
): Generator<Code> {
if (src.endsWith('.d.ts')) {
src = src.substring(0, src.length - '.d.ts'.length);
Expand Down
14 changes: 7 additions & 7 deletions packages/language-core/lib/codegen/script/template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { generateInternalComponent } from './internalComponent';
export function* generateTemplate(
options: ScriptCodegenOptions,
ctx: ScriptCodegenContext,
isClassComponent: boolean,
isClassComponent: boolean
): Generator<Code> {
ctx.generatedTemplate = true;

Expand Down Expand Up @@ -76,7 +76,7 @@ function* generateConstNameOption(options: ScriptCodegenOptions): Generator<Code
function* generateCtx(
options: ScriptCodegenOptions,
ctx: ScriptCodegenContext,
isClassComponent: boolean,
isClassComponent: boolean
): Generator<Code> {
yield `let __VLS_ctx!: `;
if (options.vueCompilerOptions.petiteVueExtensions.some(ext => options.fileBaseName.endsWith(ext))) {
Expand All @@ -101,7 +101,7 @@ function* generateCtx(
className.text,
className.offset,
'string',
false,
false
);
}
yield `>${endOfLine}`;
Expand All @@ -114,7 +114,7 @@ function* generateCtx(

function* generateTemplateContext(
options: ScriptCodegenOptions,
templateCodegenCtx: TemplateCodegenContext,
templateCodegenCtx: TemplateCodegenContext
): Generator<Code> {
/* Components */
yield `/* Components */${newLine}`;
Expand All @@ -136,7 +136,7 @@ function* generateTemplateContext(
className.text,
className.offset,
'boolean',
true,
true
);
}
}
Expand Down Expand Up @@ -165,7 +165,7 @@ function* generateCssClassProperty(
classNameWithDot: string,
offset: number,
propertyType: string,
optional: boolean,
optional: boolean
): Generator<Code> {
yield `${newLine} & { `;
yield [
Expand Down Expand Up @@ -204,7 +204,7 @@ function* generateCssVars(options: ScriptCodegenOptions, ctx: TemplateCodegenCon
ctx,
cssBind.text,
cssBind.offset,
options.ts.createSourceFile('/a.txt', cssBind.text, 99 satisfies ts.ScriptTarget.ESNext),
options.ts.createSourceFile('/a.txt', cssBind.text, 99 satisfies ts.ScriptTarget.ESNext)
)) {
if (offset === undefined) {
yield segment;
Expand Down
2 changes: 1 addition & 1 deletion packages/language-core/lib/codegen/template/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export function createTemplateCodegenContext(scriptSetupBindingNames: TemplateCo
shouldReport: () => token.errors === 0,
},
},
`// @ts-expect-error __VLS_TS_EXPECT_ERROR`,
`// @ts-expect-error __VLS_TS_EXPECT_ERROR`
);
yield `${newLine}${endOfLine}`;
expectErrorToken = undefined;
Expand Down
Loading

0 comments on commit 7c71a8d

Please sign in to comment.