member-access: fix insertion position of fixer

src/rules/memberAccessRule.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { getChildOfKind, getModifier, getNextToken, isClassLikeDeclaration } from "tsutils";
+import { getChildOfKind, getModifier, getNextToken, getTokenAtPosition, isClassLikeDeclaration } from "tsutils";
 import * as ts from "typescript";
 
 import { showWarningOnce } from "../error";
@@ -136,12 +136,17 @@ function walk(ctx: Lint.WalkContext<Options>) {
             ctx.addFailureAtNode(
                 nameNode,
                 Rule.FAILURE_STRING_FACTORY(typeToString(node), memberName),
-                Lint.Replacement.appendText(node.getStart(ctx.sourceFile), "public "),
+                Lint.Replacement.appendText(getInsertionPosition(node, ctx.sourceFile), "public "),
             );
         }
     }
 }
 
+function getInsertionPosition(member: ts.ClassElement, sourceFile: ts.SourceFile): number {
+    const node = member.decorators === undefined ? member : getTokenAtPosition(member, member.decorators.end, sourceFile)!;
+    return node.getStart(sourceFile);
+}
+
 function typeToString(node: ts.ClassElement): string {
     switch (node.kind) {
         case ts.SyntaxKind.MethodDeclaration:

test/rules/member-access/default/test.ts.fix

@@ -46,3 +46,9 @@ function main() {
         public n: number;
     }
 }
+
+abstract class Decorated {
+    @decorator public prop;
+    @decorator public abstract method() {}
+    @decorator @moreDecorator({}) public readonly static PROP = 'FOO';
+}

test/rules/member-access/default/test.ts.lint

@@ -56,3 +56,12 @@ function main() {
         public n: number;
     }
 }
+
+abstract class Decorated {
+    @decorator prop;
+               ~~~~ [The class property 'prop' must be marked either 'private', 'public', or 'protected']
+    @decorator abstract method() {}
+                        ~~~~~~ [The class method 'method' must be marked either 'private', 'public', or 'protected']
+    @decorator @moreDecorator({}) readonly static PROP = 'FOO';
+                                                  ~~~~ [The class property 'PROP' must be marked either 'private', 'public', or 'protected']
+}