Commit 9350a5e
committed
Merge branch 'master' into nodeFactory-merge
# Conflicts:
# src/compiler/factoryPublic.ts
# src/services/codefixes/convertToAsyncFunction.ts
# src/services/codefixes/helpers.ts
# src/services/codefixes/inferFromUsage.ts
# src/services/signatureHelp.ts
# tests/baselines/reference/api/tsserverlibrary.d.ts
# tests/baselines/reference/api/typescript.d.ts155 files changed
Lines changed: 18507 additions & 6974 deletions
File tree
- lib
- cs
- de
- es
- fr
- it
- ja
- ko
- pl
- pt-br
- ru
- tr
- zh-cn
- zh-tw
- src
- compiler
- harness
- loc/lcl
- chs/diagnosticMessages
- cht/diagnosticMessages
- csy/diagnosticMessages
- deu/diagnosticMessages
- esn/diagnosticMessages
- kor/diagnosticMessages
- plk/diagnosticMessages
- ptb/diagnosticMessages
- rus/diagnosticMessages
- trk/diagnosticMessages
- services
- codefixes
- refactors
- testRunner/unittests
- tests
- baselines/reference
- api
- docker
- user
- cases
- compiler
- conformance
- directives
- expressions/binaryOperators/inOperator
- functions
- jsdoc
- fourslash
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | 65 | | |
75 | 66 | | |
76 | 67 | | |
| |||
233 | 224 | | |
234 | 225 | | |
235 | 226 | | |
236 | | - | |
| 227 | + | |
237 | 228 | | |
238 | 229 | | |
239 | 230 | | |
240 | 231 | | |
241 | 232 | | |
242 | | - | |
| 233 | + | |
243 | 234 | | |
244 | 235 | | |
245 | 236 | | |
246 | 237 | | |
247 | 238 | | |
248 | 239 | | |
249 | 240 | | |
250 | | - | |
| 241 | + | |
251 | 242 | | |
252 | 243 | | |
253 | 244 | | |
254 | 245 | | |
255 | 246 | | |
256 | | - | |
| 247 | + | |
257 | 248 | | |
258 | 249 | | |
259 | 250 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | | - | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
274 | 274 | | |
275 | 275 | | |
276 | 276 | | |
277 | | - | |
| 277 | + | |
278 | 278 | | |
279 | 279 | | |
280 | 280 | | |
| |||
0 commit comments