no-duplicate-spread-property: exclude class Getters and Setters (#373)

fimbullinter · Aug 10, 2018 · b6194b3 · b6194b3
1 parent 92e7ca5
commit b6194b3
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 6 deletions.
diff --git a/baselines/packages/mimir/test/no-duplicate-spread-property/default/test.ts.lint b/baselines/packages/mimir/test/no-duplicate-spread-property/default/test.ts.lint
@@ -194,3 +194,40 @@ var v: any;
         bar: 2,
     },
 });
+
+({
+    foo: 1,
+    ...new class {
+        get foo() { return 1; }
+        set foo(v) {}
+        bar = 1;
+    },
+});
+
+({
+    foo: 1,
+    ~~~     [error no-duplicate-spread-property: Property 'foo' is overridden later.]
+    ...{
+        get foo() { return 1; },
+        bar: 2,
+    },
+});
+
+({
+    foo: 1,
+    ~~~     [error no-duplicate-spread-property: Property 'foo' is overridden later.]
+    ...{
+        get foo() { return 1; },
+        set foo(v: number) {},
+        bar: 2,
+    },
+});
+
+({
+    foo: 1,
+    ~~~     [error no-duplicate-spread-property: Property 'foo' is overridden later.]
+    ...{
+        set foo(v: number) {},
+        bar: 2,
+    },
+});
diff --git a/baselines/packages/mimir/test/no-duplicate-spread-property/loose/test.ts.lint b/baselines/packages/mimir/test/no-duplicate-spread-property/loose/test.ts.lint
@@ -174,3 +174,37 @@ var v: any;
         bar: 2,
     },
 });
+
+({
+    foo: 1,
+    ...new class {
+        get foo() { return 1; }
+        set foo(v) {}
+        bar = 1;
+    },
+});
+
+({
+    foo: 1,
+    ...{
+        get foo() { return 1; },
+        bar: 2,
+    },
+});
+
+({
+    foo: 1,
+    ...{
+        get foo() { return 1; },
+        set foo(v: number) {},
+        bar: 2,
+    },
+});
+
+({
+    foo: 1,
+    ...{
+        set foo(v: number) {},
+        bar: 2,
+    },
+});
diff --git a/packages/mimir/src/rules/no-duplicate-spread-property.ts b/packages/mimir/src/rules/no-duplicate-spread-property.ts
@@ -98,20 +98,20 @@ function getPropertyInfoFromType(type: ts.Type): PropertyInfo {
         assignedNames: [],
     };
     for (const prop of type.getProperties()) {
-        if (isClassMethod(prop))
+        if (!isSpreadableProperty(prop))
             continue;
         if ((prop.flags & ts.SymbolFlags.Optional) === 0)
             result.assignedNames.push(prop.escapedName);
         result.names.push(prop.escapedName);
     }
     return result;
 }
-function isClassMethod(prop: ts.Symbol): boolean | undefined {
-    if (prop.flags & ts.SymbolFlags.Method && prop.declarations !== undefined)
-        for (const declaration of prop.declarations)
+function isSpreadableProperty(prop: ts.Symbol): boolean | undefined {
+    if (prop.flags & (ts.SymbolFlags.Method | ts.SymbolFlags.Accessor))
+        for (const declaration of prop.declarations!)
             if (isClassLikeDeclaration(declaration.parent!))
-                return true;
-    return false;
+                return false;
+    return true;
 }
 
 function combinePropertyInfo(a: PropertyInfo, b: PropertyInfo): PropertyInfo {

diff --git a/packages/mimir/test/no-duplicate-spread-property/test.ts b/packages/mimir/test/no-duplicate-spread-property/test.ts
@@ -174,3 +174,37 @@ var v: any;
         bar: 2,
     },
 });
+
+({
+    foo: 1,
+    ...new class {
+        get foo() { return 1; }
+        set foo(v) {}
+        bar = 1;
+    },
+});
+
+({
+    foo: 1,
+    ...{
+        get foo() { return 1; },
+        bar: 2,
+    },
+});
+
+({
+    foo: 1,
+    ...{
+        get foo() { return 1; },
+        set foo(v: number) {},
+        bar: 2,
+    },
+});
+
+({
+    foo: 1,
+    ...{
+        set foo(v: number) {},
+        bar: 2,
+    },
+});