Skip to content

Commit 5822a8c

Browse files
committed
Merge branch 'master' into genericRestArityCheck
# Conflicts: # src/compiler/checker.ts
2 parents e88f632 + bd7b97c commit 5822a8c

File tree

94 files changed

+2009
-1233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+2009
-1233
lines changed

.mailmap

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Rostislav Galimsky <rostgal@gmail.com>
163163
Richard Knoll <riknoll@users.noreply.github.com> Richard Knoll <riknoll@microsoft.com>
164164
Richard Karmazín <richard@karmazin.cz>
165165
Rowan Wyborn <rwyborn@internode.on.net>
166-
Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com> Ryan Cavanaugh <ryan.cavanaugh@microsoft.com> Ryan Cavanaugh <ryanca@microsoft.com>
166+
Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com> Ryan Cavanaugh <ryan.cavanaugh@microsoft.com> Ryan Cavanaugh <ryanca@microsoft.com> Ryan Cavanaugh <the.ryan.cavanaugh@gmail.com>
167167
Ryohei Ikegami <iofg2100@gmail.com>
168168
Sarangan Rajamanickam <sarajama@microsoft.com>
169169
Sébastien Arod <sebastien.arod@gmail.com>
@@ -340,4 +340,21 @@ EcoleKeine <Ecole_k@qq.com> # Ecole Keine
340340
Khải <hvksmr1996@gmail.com>
341341
rhysd <lin90162@yahoo.co.jp> # @rhysd
342342
Zen <843968788@qq.com> Zzzen <843968788@qq.com> # @Zzzen
343-
bluelovers <codelovers@users.sourceforge.net> # @bluelovers
343+
bluelovers <codelovers@users.sourceforge.net> # @bluelovers
344+
Dan Freeman <dfreeman@salsify.com>
345+
David Sherret <dsherret@gmail.com>
346+
David Staheli <dastahel@microsoft.com>
347+
Elizabeth Dinella <elizabeth.a.dinella@gmail.com>
348+
John Doe <github.john.doe@outlook.com>
349+
Kevin Gibbons <kevin@shapesecurity.com>
350+
Markus Johnsson <markus.johnsson@infviz.com>
351+
Martin Probst <martin@probst.io>
352+
Mateusz Burzyński <mateuszburzynski@gmail.com>
353+
Steven <steven@ceriously.com> # @styfle
354+
Pi Lanningham <pi.lanningham@gmail.com>
355+
Sam Bostock <sam.bostock@shopify.com>
356+
Vimal Raghubir <vraghubir0418@gmail.com>
357+
Vyacheslav Pukhanov <vyacheslav.pukhanov@gmail.com>
358+
dangoo <daniel.gooss@sinnerschrader.com> # Daniel Gooss
359+
krk <keremkat@gmail.com> # Kerem Kat
360+
micnic <micnic90@gmail.com> # Nicu Micleușanu

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ branches:
1919
- release-2.7
2020
- release-2.8
2121
- release-2.9
22+
- release-3.0
2223

2324
install:
2425
- npm uninstall typescript --no-save

AUTHORS.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,19 @@ TypeScript is authored by:
7474
* Dafrok Zhang
7575
* Dahan Gong
7676
* Dan Corder
77+
* Dan Freeman
7778
* Dan Quirk
79+
* Daniel Gooss
7880
* Daniel Hollocher
7981
* Daniel Król
8082
* Daniel Lehenbauer
8183
* Daniel Rosenwasser
8284
* David Kmenta
8385
* David Li
8486
* David Sheldrick
87+
* David Sherret
8588
* David Souther
89+
* David Staheli
8690
* Denis Nedelyaev
8791
* Derek P Sifford
8892
* Dhruv Rajvanshi
@@ -96,6 +100,7 @@ TypeScript is authored by:
96100
* @e-cloud
97101
* Ecole Keine
98102
* Elisée Maurer
103+
* Elizabeth Dinella
99104
* Emilio García-Pumarino
100105
* Eric Grube
101106
* Eric Tsang
@@ -161,6 +166,7 @@ TypeScript is authored by:
161166
* Joel Day
162167
* Joey Wilson
163168
* Johannes Rieken
169+
* John Doe
164170
* John Vilk
165171
* Jonathan Bond-Caron
166172
* Jonathan Park
@@ -184,7 +190,9 @@ TypeScript is authored by:
184190
* Keith Mashinter
185191
* Ken Howard
186192
* Kenji Imamula
193+
* Kerem Kat
187194
* Kevin Donnelly
195+
* Kevin Gibbons
188196
* Kevin Lang
189197
* Khải
190198
* Kitson Kelly
@@ -201,10 +209,13 @@ TypeScript is authored by:
201209
* Manish Giri
202210
* Marin Marinov
203211
* Marius Schulz
212+
* Markus Johnsson
204213
* Martin Hiller
214+
* Martin Probst
205215
* Martin Vseticka
206216
* Martyn Janes
207217
* Masahiro Wakame
218+
* Mateusz Burzyński
208219
* Matt Bierner
209220
* Matt McCutchen
210221
* Matt Mitchell
@@ -223,10 +234,10 @@ TypeScript is authored by:
223234
* Mohamed Hegazy
224235
* Mohsen Azimi
225236
* Myles Megyesi
226-
* Natalie Coley
227237
* Nathan Shively-Sanders
228238
* Nathan Yee
229239
* Nicolas Henry
240+
* Nicu Micleușanu
230241
* @nieltg
231242
* Nima Zahedi
232243
* Noah Chen
@@ -248,6 +259,7 @@ TypeScript is authored by:
248259
* Peter Burns
249260
* Philip Bulley
250261
* Philippe Voinov
262+
* Pi Lanningham
251263
* Piero Cangianiello
252264
* @piloopin
253265
* Prayag Verma
@@ -270,6 +282,7 @@ TypeScript is authored by:
270282
* Rowan Wyborn
271283
* Ryan Cavanaugh
272284
* Ryohei Ikegami
285+
* Sam Bostock
273286
* Sam El-Husseini
274287
* Sarangan Rajamanickam
275288
* Sean Barag
@@ -290,6 +303,7 @@ TypeScript is authored by:
290303
* Stas Vilchik
291304
* Stephan Ginthör
292305
* Steve Lucco
306+
* @styfle
293307
* Sudheesh Singanamalla
294308
* Sébastien Arod
295309
* @T18970237136
@@ -316,8 +330,10 @@ TypeScript is authored by:
316330
* Vidar Tonaas Fauske
317331
* Viktor Zozulyak
318332
* Vilic Vane
333+
* Vimal Raghubir
319334
* Vladimir Kurchatkin
320335
* Vladimir Matveev
336+
* Vyacheslav Pukhanov
321337
* Wenlu Wang
322338
* Wesley Wigham
323339
* William Orr

src/compiler/binder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ namespace ts {
225225
node.symbol = symbol;
226226
symbol.declarations = append(symbol.declarations, node);
227227

228-
if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
228+
if (symbolFlags & (SymbolFlags.Class | SymbolFlags.Enum | SymbolFlags.Module | SymbolFlags.Variable) && !symbol.exports) {
229229
symbol.exports = createSymbolTable();
230230
}
231231

232-
if (symbolFlags & SymbolFlags.HasMembers && !symbol.members) {
232+
if (symbolFlags & (SymbolFlags.Class | SymbolFlags.Interface | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) && !symbol.members) {
233233
symbol.members = createSymbolTable();
234234
}
235235

0 commit comments

Comments
 (0)