Merge pull request #4531 from DickvdBrink/fix-occurrences-classexpressions

Fix occurrences for classexpressions

Author: DanielRosenwasser

src/services/services.ts

@@ -5885,6 +5885,7 @@ namespace ts {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
+                            case SyntaxKind.ClassExpression:
                             case SyntaxKind.ClassDeclaration:
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.

tests/cases/fourslash/getOccurrencesClassExpressionStaticThis.ts

@@ -0,0 +1,56 @@
+/// <reference path='fourslash.ts' />
+
+////var x = class C {
+////    public x;
+////    public y;
+////    public z;
+////    public staticX;
+////    constructor() {
+////        this;
+////        this.x;
+////        this.y;
+////        this.z;
+////    }
+////    foo() {
+////        this;
+////        () => this;
+////        () => {
+////            if (this) {
+////                this;
+////            }
+////        }
+////        function inside() {
+////            this;
+////            (function (_) {
+////                this;
+////            })(this);
+////        }
+////        return this.x;
+////    }
+////
+////    static bar() {
+////        [|this|];
+////        [|this|].staticX;
+////        () => [|this|];
+////        () => {
+////            if ([|this|]) {
+////                [|this|];
+////            }
+////        }
+////        function inside() {
+////            this;
+////            (function (_) {
+////                this;
+////            })(this);
+////        }
+////    }
+////}
+
+const ranges = test.ranges();
+for (let r of ranges) {
+    goTo.position(r.start);
+
+    for (let range of ranges) {
+        verify.occurrencesAtPositionContains(range, false);
+    }
+}

tests/cases/fourslash/getOccurrencesClassExpressionThis.ts

@@ -0,0 +1,54 @@
+/// <reference path='fourslash.ts' />
+
+////var x = class C {
+////    public x;
+////    public y;
+////    public z;
+////    constructor() {
+////        [|this|];
+////        [|this|].x;
+////        [|this|].y;
+////        [|this|].z;
+////    }
+////    foo() {
+////        [|this|];
+////        () => [|this|];
+////        () => {
+////            if ([|this|]) {
+////                [|this|];
+////            }
+////        }
+////        function inside() {
+////            this;
+////            (function (_) {
+////                this;
+////            })(this);
+////        }
+////        return [|this|].x;
+////    }
+////
+////    static bar() {
+////        this;
+////        () => this;
+////        () => {
+////            if (this) {
+////                this;
+////            }
+////        }
+////        function inside() {
+////            this;
+////            (function (_) {
+////                this;
+////            })(this);
+////        }
+////    }
+////}
+
+const ranges = test.ranges();
+for (let r of ranges) {
+    goTo.position(r.start);
+
+    for (let range of ranges) {
+        verify.occurrencesAtPositionContains(range, false);
+    }
+}