Commit 305100d

KazariEXFloEdelmann

and

authored

fix(define-macros-order): skip enum declarations and statements with declare modifier (#2918)

Co-authored-by: Flo Edelmann <git@flo-edelmann.de>

1 parent 28facb7 commit 305100dCopy full SHA for 305100d

File tree

+16

-0

lines changed

+16

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,5 @@`
	`1`	`+---`
	`2`	`+"eslint-plugin-vue": patch`
	`3`	`+---`
	`4`	`+`
	`5`	+Changed `vue/define-macros-order` to ignore enum declarations and `declare` statements

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,13 @@ function inScriptSetup(scriptSetup, node) {`
`33`	`33`	`)`
`34`	`34`	`}`
`35`	`35`
	`36`	`+/**`
	`37`	`+ * @param {ASTNode} node`
	`38`	`+ */`
	`39`	`+function isDeclareStatement(node) {`
	`40`	`+ return 'declare' in node && node.declare === true`
	`41`	`+}`
	`42`	`+`
`36`	`43`	`/**`
`37`	`44`	`* @param {ASTNode} node`
`38`	`45`	`*/`
`@@ -53,6 +60,7 @@ function isUseStrictStatement(node) {`
`53`	`60`	`function getTargetStatementPosition(scriptSetup, program) {`
`54`	`61`	`const skipStatements = new Set([`
`55`	`62`	`'ImportDeclaration',`
	`63`	`+ 'TSEnumDeclaration',`
`56`	`64`	`'TSModuleDeclaration',`
`57`	`65`	`'TSInterfaceDeclaration',`
`58`	`66`	`'TSTypeAliasDeclaration',`
`@@ -65,6 +73,7 @@ function getTargetStatementPosition(scriptSetup, program) {`
`65`	`73`	`if (`
`66`	`74`	`inScriptSetup(scriptSetup, item) &&`
`67`	`75`	`!skipStatements.has(item.type) &&`
	`76`	`+ !isDeclareStatement(item) &&`
`68`	`77`	`!isUseStrictStatement(item)`
`69`	`78`	`) {`
`70`	`79`	`return index`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,8 @@ tester.run('define-macros-order', rule, {`
`128`	`128`	`import { bar } from 'foo'`
`129`	`129`	`declare global {}`
`130`	`130`	`declare namespace Namespace {}`
	`131`	`+ declare const foo: string`
	`132`	`+ declare function bar(): void`
`131`	`133`	`export interface Props {`
`132`	`134`	`msg?: string`
`133`	`135`	`labels?: string[]`

Comments

(0)