Skip to content

Commit efdbeba

Browse files
author
Arthur Ozga
committed
Merge branch 'master' into isInMultiLineComment
2 parents cc88091 + 86d0fa2 commit efdbeba

1,154 files changed

Lines changed: 235237 additions & 198672 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,5 @@ internal/
5757
!tests/cases/projects/NodeModulesSearch/**/*
5858
!tests/baselines/reference/project/nodeModules*/**/*
5959
.idea
60-
yarn.lock
60+
yarn.lock
61+
package-lock.json

‎.mailmap‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,4 +248,23 @@ rdosanjh <me@rajdeep.io> # Raj Dosanjh
248248
gdh1995 <gdh1995@qq.com> # Dahan Gong
249249
cedvdb <cedvandenbosch@gmail.com> # @cedvdb
250250
kpreisser <kpreisser@users.noreply.github.com> # K. Preißer
251-
e-cloud <saintscott119@gmail.com> # @e-cloud
251+
e-cloud <saintscott119@gmail.com> # @e-cloud
252+
Andrew Casey <amcasey@users.noreply.github.com> Andrew Casey <andrew.casey@microsoft.com>
253+
Andrew Stegmaier <andrew.stegmaier@gmail.com>
254+
Benny Neugebauer <bn@bennyn.de>
255+
Blaine Bublitz <blaine.bublitz@gmail.com>
256+
Charles Pierce <cpierce.grad@gmail.com>
257+
Daniel Król <daniel@krol.me>
258+
Diogo Franco (Kovensky) <diogomfranco@gmail.com>
259+
Donald Pipowitch <pipo@senaeh.de>
260+
Halasi Tamás <trusted.tomato@gmail.com>
261+
Ika <ikatyang@gmail.com>
262+
Joe Chung <joechung@microsoft.com>
263+
Kate Miháliková <kate@katemihalikova.cz>
264+
Mohsen Azimi <mazimi@lyft.com>
265+
Noel Varanda <ncwvaranda@gmail.com>
266+
Reiner Dolp <reiner-dolp@users.noreply.github.com>
267+
t_ <t-mrt@users.noreply.github.com> # @t_
268+
TravCav <xurrux@gmail.com> # @TravCav
269+
Vladimir Kurchatkin <vladimir.kurchatkin@gmail.com>
270+
William Orr <will@worrbase.com>

‎.travis.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ matrix:
1616
branches:
1717
only:
1818
- master
19-
- release-2.1
20-
- release-2.2
21-
- release-2.3
2219

2320
install:
2421
- npm uninstall typescript --no-save

‎AUTHORS.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ TypeScript is authored by:
1515
* Anders Hejlsberg
1616
* Andreas Martin
1717
* Andrej Baran
18+
* Andrew Casey
1819
* Andrew Ochsner
20+
* Andrew Stegmaier
1921
* Andrew Z Allen
2022
* András Parditka
2123
* Andy Hanson
@@ -31,14 +33,17 @@ TypeScript is authored by:
3133
* Ben Duffield
3234
* Ben Mosher
3335
* Benjamin Bock
36+
* Benny Neugebauer
3437
* Bill Ticehurst
38+
* Blaine Bublitz
3539
* Blake Embrey
3640
* @bootstraponline
3741
* Bowden Kelly
3842
* Brett Mayen
3943
* Bryan Forbes
4044
* Caitlin Potter
4145
* @cedvdb
46+
* Charles Pierce
4247
* Charly POLY
4348
* Chris Bubernak
4449
* Christophe Vidal
@@ -52,6 +57,7 @@ TypeScript is authored by:
5257
* Dan Corder
5358
* Dan Quirk
5459
* Daniel Hollocher
60+
* Daniel Król
5561
* Daniel Lehenbauer
5662
* Daniel Rosenwasser
5763
* David Kmenta
@@ -60,9 +66,11 @@ TypeScript is authored by:
6066
* David Souther
6167
* Denis Nedelyaev
6268
* Dick van den Brink
69+
* Diogo Franco (Kovensky)
6370
* Dirk Bäumer
6471
* Dirk Holtwick
6572
* Dom Chen
73+
* Donald Pipowitch
6674
* Doug Ilijev
6775
* @e-cloud
6876
* Elisée Maurer
@@ -89,12 +97,14 @@ TypeScript is authored by:
8997
* Guilherme Oenning
9098
* Guillaume Salles
9199
* Guy Bedford
100+
* Halasi Tamás
92101
* Harald Niesche
93102
* Hendrik Liebau
94103
* Herrington Darkholme
95104
* Homa Wong
96105
* Iain Monro
97106
* Igor Novozhilov
107+
* Ika
98108
* Ingvar Stepanyan
99109
* Isiah Meadows
100110
* Ivo Gabe de Wolff
@@ -111,6 +121,7 @@ TypeScript is authored by:
111121
* Jeffrey Morlan
112122
* Jesse Schalken
113123
* Jiri Tobisek
124+
* Joe Chung
114125
* Joel Day
115126
* Joey Wilson
116127
* Johannes Rieken
@@ -131,6 +142,7 @@ TypeScript is authored by:
131142
* K. Preißer
132143
* Kagami Sascha Rosylight
133144
* Kanchalai Tanglertsampan
145+
* Kate Miháliková
134146
* Keith Mashinter
135147
* Ken Howard
136148
* Kenji Imamula
@@ -159,13 +171,15 @@ TypeScript is authored by:
159171
* Mike Busyrev
160172
* Mine Starks
161173
* Mohamed Hegazy
174+
* Mohsen Azimi
162175
* Myles Megyesi
163176
* Natalie Coley
164177
* Nathan Shively-Sanders
165178
* Nathan Yee
166179
* Nicolas Henry
167180
* Nima Zahedi
168181
* Noah Chen
182+
* Noel Varanda
169183
* Noj Vek
170184
* Oleg Mihailik
171185
* Oleksandr Chekhovskyi
@@ -186,6 +200,7 @@ TypeScript is authored by:
186200
* Punya Biswal
187201
* Rado Kirov
188202
* Raj Dosanjh
203+
* Reiner Dolp
189204
* Richard Karmazín
190205
* Richard Knoll
191206
* Richard Sentino
@@ -213,6 +228,7 @@ TypeScript is authored by:
213228
* Sudheesh Singanamalla
214229
* Sébastien Arod
215230
* @T18970237136
231+
* @t_
216232
* Tarik Ozket
217233
* Tetsuharu Ohzeki
218234
* Thomas Loubiou
@@ -225,13 +241,16 @@ TypeScript is authored by:
225241
* togru
226242
* Tomas Grubliauskas
227243
* Torben Fitschen
244+
* @TravCav
228245
* TruongSinh Tran-Nguyen
229246
* Vadi Taslim
230247
* Vidar Tonaas Fauske
231248
* Viktor Zozulyak
232249
* Vilic Vane
250+
* Vladimir Kurchatkin
233251
* Vladimir Matveev
234252
* Wesley Wigham
253+
* William Orr
235254
* York Yao
236255
* @yortus
237256
* Yuichi Nukiyama

0 commit comments

Comments
 (0)