Skip to content

Commit 1fa69ca

Browse files
mhegazymhegazy
committed
handel private properties correctelly
1 parent b40512d commit 1fa69ca

File tree

6 files changed

+408
-2
lines changed

6 files changed

+408
-2
lines changed

‎src/compiler/checker.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10241,8 +10241,13 @@ namespace ts {
1024110241
return unknownType;
1024210242
}
1024310243

10244-
if (noUnusedIdentifiers && !isInAmbientContext(node)) {
10245-
prop.isReferenced = true;
10244+
if (noUnusedIdentifiers && (prop.flags & SymbolFlags.ClassMember)) {
10245+
if (prop.flags & SymbolFlags.Instantiated) {
10246+
getSymbolLinks(prop).target.isReferenced = true;
10247+
}
10248+
else {
10249+
prop.isReferenced = true;
10250+
}
1024610251
}
1024710252

1024810253
getNodeLinks(node).resolvedSymbol = prop;

‎src/compiler/types.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,6 +2107,8 @@ namespace ts {
21072107
PropertyOrAccessor = Property | Accessor,
21082108
Export = ExportNamespace | ExportType | ExportValue,
21092109

2110+
ClassMember = Method | Accessor | Property,
2111+
21102112
/* @internal */
21112113
// The set of things we consider semantically classifiable. Used to speed up the LS during
21122114
// classification.

‎tests/baselines/reference/unusedPrivateMembers.js

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
//// [unusedPrivateMembers.ts]
2+
3+
class Test1 {
4+
private initializeInternal() {
5+
}
6+
7+
public test() {
8+
var x = new Test1();
9+
x.initializeInternal();
10+
}
11+
}
12+
13+
class Test2 {
14+
private p = 0;
15+
public test() {
16+
var x = new Test2();
17+
x.p;
18+
}
19+
}
20+
21+
class Test3 {
22+
private get x () {
23+
return 0;
24+
}
25+
26+
public test() {
27+
var x = new Test3();
28+
x.x;
29+
}
30+
}
31+
32+
class Test4 {
33+
private set x(v) {
34+
v;
35+
}
36+
37+
public test() {
38+
var x = new Test4();
39+
x.x;
40+
}
41+
}
42+
43+
class Test5<T> {
44+
private p: T;
45+
public test() {
46+
var x = new Test5<number>();
47+
x.p;
48+
}
49+
}
50+
51+
52+
//// [unusedPrivateMembers.js]
53+
var Test1 = (function () {
54+
function Test1() {
55+
}
56+
Test1.prototype.initializeInternal = function () {
57+
};
58+
Test1.prototype.test = function () {
59+
var x = new Test1();
60+
x.initializeInternal();
61+
};
62+
return Test1;
63+
}());
64+
var Test2 = (function () {
65+
function Test2() {
66+
this.p = 0;
67+
}
68+
Test2.prototype.test = function () {
69+
var x = new Test2();
70+
x.p;
71+
};
72+
return Test2;
73+
}());
74+
var Test3 = (function () {
75+
function Test3() {
76+
}
77+
Object.defineProperty(Test3.prototype, "x", {
78+
get: function () {
79+
return 0;
80+
},
81+
enumerable: true,
82+
configurable: true
83+
});
84+
Test3.prototype.test = function () {
85+
var x = new Test3();
86+
x.x;
87+
};
88+
return Test3;
89+
}());
90+
var Test4 = (function () {
91+
function Test4() {
92+
}
93+
Object.defineProperty(Test4.prototype, "x", {
94+
set: function (v) {
95+
v;
96+
},
97+
enumerable: true,
98+
configurable: true
99+
});
100+
Test4.prototype.test = function () {
101+
var x = new Test4();
102+
x.x;
103+
};
104+
return Test4;
105+
}());
106+
var Test5 = (function () {
107+
function Test5() {
108+
}
109+
Test5.prototype.test = function () {
110+
var x = new Test5();
111+
x.p;
112+
};
113+
return Test5;
114+
}());

‎tests/baselines/reference/unusedPrivateMembers.symbols

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
=== tests/cases/compiler/unusedPrivateMembers.ts ===
2+
3+
class Test1 {
4+
>Test1 : Symbol(Test1, Decl(unusedPrivateMembers.ts, 0, 0))
5+
6+
private initializeInternal() {
7+
>initializeInternal : Symbol(Test1.initializeInternal, Decl(unusedPrivateMembers.ts, 1, 13))
8+
}
9+
10+
public test() {
11+
>test : Symbol(Test1.test, Decl(unusedPrivateMembers.ts, 3, 5))
12+
13+
var x = new Test1();
14+
>x : Symbol(x, Decl(unusedPrivateMembers.ts, 6, 11))
15+
>Test1 : Symbol(Test1, Decl(unusedPrivateMembers.ts, 0, 0))
16+
17+
x.initializeInternal();
18+
>x.initializeInternal : Symbol(Test1.initializeInternal, Decl(unusedPrivateMembers.ts, 1, 13))
19+
>x : Symbol(x, Decl(unusedPrivateMembers.ts, 6, 11))
20+
>initializeInternal : Symbol(Test1.initializeInternal, Decl(unusedPrivateMembers.ts, 1, 13))
21+
}
22+
}
23+
24+
class Test2 {
25+
>Test2 : Symbol(Test2, Decl(unusedPrivateMembers.ts, 9, 1))
26+
27+
private p = 0;
28+
>p : Symbol(Test2.p, Decl(unusedPrivateMembers.ts, 11, 13))
29+
30+
public test() {
31+
>test : Symbol(Test2.test, Decl(unusedPrivateMembers.ts, 12, 18))
32+
33+
var x = new Test2();
34+
>x : Symbol(x, Decl(unusedPrivateMembers.ts, 14, 11))
35+
>Test2 : Symbol(Test2, Decl(unusedPrivateMembers.ts, 9, 1))
36+
37+
x.p;
38+
>x.p : Symbol(Test2.p, Decl(unusedPrivateMembers.ts, 11, 13))
39+
>x : Symbol(x, Decl(unusedPrivateMembers.ts, 14, 11))
40+
>p : Symbol(Test2.p, Decl(unusedPrivateMembers.ts, 11, 13))
41+
}
42+
}
43+
44+
class Test3 {
45+
>Test3 : Symbol(Test3, Decl(unusedPrivateMembers.ts, 17, 1))
46+
47+
private get x () {
48+
>x : Symbol(Test3.x, Decl(unusedPrivateMembers.ts, 19, 13))
49+
50+
return 0;
51+
}
52+
53+
public test() {
54+
>test : Symbol(Test3.test, Decl(unusedPrivateMembers.ts, 22, 5))
55+
56+
var x = new Test3();
57+
>x : Symbol(x, Decl(unusedPrivateMembers.ts, 25, 11))
58+
>Test3 : Symbol(Test3, Decl(unusedPrivateMembers.ts, 17, 1))
59+
60+
x.x;
61+
>x.x : Symbol(Test3.x, Decl(unusedPrivateMembers.ts, 19, 13))
62+
>x : Symbol(x, Decl(unusedPrivateMembers.ts, 25, 11))
63+
>x : Symbol(Test3.x, Decl(unusedPrivateMembers.ts, 19, 13))
64+
}
65+
}
66+
67+
class Test4 {
68+
>Test4 : Symbol(Test4, Decl(unusedPrivateMembers.ts, 28, 1))
69+
70+
private set x(v) {
71+
>x : Symbol(Test4.x, Decl(unusedPrivateMembers.ts, 30, 13))
72+
>v : Symbol(v, Decl(unusedPrivateMembers.ts, 31, 18))
73+
74+
v;
75+
>v : Symbol(v, Decl(unusedPrivateMembers.ts, 31, 18))
76+
}
77+
78+
public test() {
79+
>test : Symbol(Test4.test, Decl(unusedPrivateMembers.ts, 33, 5))
80+
81+
var x = new Test4();
82+
>x : Symbol(x, Decl(unusedPrivateMembers.ts, 36, 11))
83+
>Test4 : Symbol(Test4, Decl(unusedPrivateMembers.ts, 28, 1))
84+
85+
x.x;
86+
>x.x : Symbol(Test4.x, Decl(unusedPrivateMembers.ts, 30, 13))
87+
>x : Symbol(x, Decl(unusedPrivateMembers.ts, 36, 11))
88+
>x : Symbol(Test4.x, Decl(unusedPrivateMembers.ts, 30, 13))
89+
}
90+
}
91+
92+
class Test5<T> {
93+
>Test5 : Symbol(Test5, Decl(unusedPrivateMembers.ts, 39, 1))
94+
>T : Symbol(T, Decl(unusedPrivateMembers.ts, 41, 12))
95+
96+
private p: T;
97+
>p : Symbol(Test5.p, Decl(unusedPrivateMembers.ts, 41, 16))
98+
>T : Symbol(T, Decl(unusedPrivateMembers.ts, 41, 12))
99+
100+
public test() {
101+
>test : Symbol(Test5.test, Decl(unusedPrivateMembers.ts, 42, 17))
102+
103+
var x = new Test5<number>();
104+
>x : Symbol(x, Decl(unusedPrivateMembers.ts, 44, 11))
105+
>Test5 : Symbol(Test5, Decl(unusedPrivateMembers.ts, 39, 1))
106+
107+
x.p;
108+
>x.p : Symbol(Test5.p, Decl(unusedPrivateMembers.ts, 41, 16))
109+
>x : Symbol(x, Decl(unusedPrivateMembers.ts, 44, 11))
110+
>p : Symbol(Test5.p, Decl(unusedPrivateMembers.ts, 41, 16))
111+
}
112+
}
113+

‎tests/baselines/reference/unusedPrivateMembers.types

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
=== tests/cases/compiler/unusedPrivateMembers.ts ===
2+
3+
class Test1 {
4+
>Test1 : Test1
5+
6+
private initializeInternal() {
7+
>initializeInternal : () => void
8+
}
9+
10+
public test() {
11+
>test : () => void
12+
13+
var x = new Test1();
14+
>x : Test1
15+
>new Test1() : Test1
16+
>Test1 : typeof Test1
17+
18+
x.initializeInternal();
19+
>x.initializeInternal() : void
20+
>x.initializeInternal : () => void
21+
>x : Test1
22+
>initializeInternal : () => void
23+
}
24+
}
25+
26+
class Test2 {
27+
>Test2 : Test2
28+
29+
private p = 0;
30+
>p : number
31+
>0 : number
32+
33+
public test() {
34+
>test : () => void
35+
36+
var x = new Test2();
37+
>x : Test2
38+
>new Test2() : Test2
39+
>Test2 : typeof Test2
40+
41+
x.p;
42+
>x.p : number
43+
>x : Test2
44+
>p : number
45+
}
46+
}
47+
48+
class Test3 {
49+
>Test3 : Test3
50+
51+
private get x () {
52+
>x : number
53+
54+
return 0;
55+
>0 : number
56+
}
57+
58+
public test() {
59+
>test : () => void
60+
61+
var x = new Test3();
62+
>x : Test3
63+
>new Test3() : Test3
64+
>Test3 : typeof Test3
65+
66+
x.x;
67+
>x.x : number
68+
>x : Test3
69+
>x : number
70+
}
71+
}
72+
73+
class Test4 {
74+
>Test4 : Test4
75+
76+
private set x(v) {
77+
>x : any
78+
>v : any
79+
80+
v;
81+
>v : any
82+
}
83+
84+
public test() {
85+
>test : () => void
86+
87+
var x = new Test4();
88+
>x : Test4
89+
>new Test4() : Test4
90+
>Test4 : typeof Test4
91+
92+
x.x;
93+
>x.x : any
94+
>x : Test4
95+
>x : any
96+
}
97+
}
98+
99+
class Test5<T> {
100+
>Test5 : Test5<T>
101+
>T : T
102+
103+
private p: T;
104+
>p : T
105+
>T : T
106+
107+
public test() {
108+
>test : () => void
109+
110+
var x = new Test5<number>();
111+
>x : Test5<number>
112+
>new Test5<number>() : Test5<number>
113+
>Test5 : typeof Test5
114+
115+
x.p;
116+
>x.p : number
117+
>x : Test5<number>
118+
>p : number
119+
}
120+
}
121+

0 commit comments

Comments
 (0)