Commit5ed8a4a

authored and

committed

Update: explicit-member-accessibility only check *.ts and *.tsx files (Fixestypescript-eslint#102) (typescript-eslint#104)

* Only check *.ts and *.tsx files (Fixestypescript-eslint#102)* Move duplicated isTypescript() function to util.js* Simplify regex in isTypescript()

1 parent5aa3b22 commit5ed8a4aCopy full SHA for 5ed8a4a

File tree

+36

-15

lines changed

+36

-15

lines changed

Lines changed: 3 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`*/`
`5`	`5`	`"use strict";`
`6`	`6`
	`7`	`+constutil=require("../util");`
	`8`	`+`
`7`	`9`	`//------------------------------------------------------------------------------`
`8`	`10`	`// Rule Definition`
`9`	`11`	`//------------------------------------------------------------------------------`
`@@ -49,16 +51,6 @@ module.exports = {`
`49`	`51`	`returnparent.type==="MethodDefinition"&&parent.kind==="set";`
`50`	`52`	`}`
`51`	`53`
`52`		`-/**`
`53`		`- * Check if the context file name is .ts or .tsx`
`54`		`- *@param {string} fileName The context file name`
`55`		- @returns {boolean} `true` if the file name ends in .ts or *.tsx
`56`		`- *@private`
`57`		`- */`
`58`		`-functionisTypescript(fileName){`
`59`		`-return/\.(ts\|tsx)$/.test(fileName);`
`60`		`-}`
`61`		`-`
`62`	`54`	`/**`
`63`	`55`	`* Checks if a function declaration/expression has a return type.`
`64`	`56`	`*@param {ASTNode} node The node representing a function.`
`@@ -70,7 +62,7 @@ module.exports = {`
`70`	`62`	`!node.returnType&&`
`71`	`63`	`!isConstructor(node.parent)&&`
`72`	`64`	`!isSetter(node.parent)&&`
`73`		`-isTypescript(context.getFilename())`
	`65`	`+util.isTypescript(context.getFilename())`
`74`	`66`	`){`
`75`	`67`	`context.report({`
`76`	`68`	`node,`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,10 @@ module.exports = {`
`35`	`35`	`*@private`
`36`	`36`	`*/`
`37`	`37`	`functioncheckMethodAccessibilityModifier(methodDefinition){`
`38`		`-if(!methodDefinition.accessibility){`
	`38`	`+if(`
	`39`	`+!methodDefinition.accessibility&&`
	`40`	`+util.isTypescript(context.getFilename())`
	`41`	`+){`
`39`	`42`	`context.report({`
`40`	`43`	`node:methodDefinition,`
`41`	`44`	message:`Missing accessibility modifier on method definition${
`@@ -52,7 +55,10 @@ module.exports = {`
`52`	`55`	`*@private`
`53`	`56`	`*/`
`54`	`57`	`functioncheckPropertyAccessibilityModifier(classProperty){`
`55`		`-if(!classProperty.accessibility){`
	`58`	`+if(`
	`59`	`+!classProperty.accessibility&&`
	`60`	`+util.isTypescript(context.getFilename())`
	`61`	`+){`
`56`	`62`	`context.report({`
`57`	`63`	`node:classProperty,`
`58`	`64`	message:`Missing accessibility modifier on class property${

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,11 @@`
`1`	`1`	`"use strict";`
`2`	`2`
`3`	`3`	exports.tslintRule=name=>`\`${name}\` from TSLint`;
	`4`	`+`
	`5`	`+/**`
	`6`	`+ * Check if the context file name is .ts or .tsx`
	`7`	`+ *@param {string} fileName The context file name`
	`8`	+ @returns {boolean} `true` if the file name ends in .ts or *.tsx
	`9`	`+ *@private`
	`10`	`+ */`
	`11`	`+exports.isTypescript=fileName=>/\.tsx?$/.test(fileName);`

Lines changed: 17 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,18 +21,32 @@ const ruleTester = new RuleTester({`
`21`	`21`
`22`	`22`	`ruleTester.run("explicit-member-accessibility",rule,{`
`23`	`23`	`valid:[`
`24`		-`
	`24`	`+{`
	`25`	`+filename:"test.ts",`
	`26`	+code:`
`25`	`27`	`class Test {`
`26`	`28`	`protected name: string`
`27`	`29`	`private x: number`
`28`	`30`	`public getX () {`
`29`	`31`	`return this.x`
`30`	`32`	`}`
`31`	`33`	`}`
`32`		- `
	`34`	+ `
	`35`	`+},`
	`36`	`+{`
	`37`	`+filename:"test.js",`
	`38`	+code:`
	`39`	`+class Test {`
	`40`	`+ getX () {`
	`41`	`+ return 1;`
	`42`	`+ }`
	`43`	`+}`
	`44`	+ `
	`45`	`+}`
`33`	`46`	`],`
`34`	`47`	`invalid:[`
`35`	`48`	`{`
	`49`	`+filename:"test.ts",`
`36`	`50`	code:`
`37`	`51`	`class Test {`
`38`	`52`	`x: number`
`@@ -51,6 +65,7 @@ class Test {`
`51`	`65`	`]`
`52`	`66`	`},`
`53`	`67`	`{`
	`68`	`+filename:"test.ts",`
`54`	`69`	code:`
`55`	`70`	`class Test {`
`56`	`71`	`private x: number`

Comments

(0)