Commit fad8892
committed
Merge branch 'master' into exportEqualsMerged
Conflicts:
src/compiler/checker.ts
src/compiler/emitter.ts
src/compiler/types.ts
tests/baselines/reference/APISample_compile.js
tests/baselines/reference/APISample_linter.js
tests/baselines/reference/APISample_transform.js
tests/baselines/reference/APISample_watcher.js
tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
tests/baselines/reference/es6ExportAllInEs5.js
tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.jsFile tree
432 files changed
+8574
-3792
lines changed- src
- compiler
- lib
- services
- formatting
- tests
- baselines/reference
- project/noDefaultLib
- amd
- node
- cases
- compiler
- conformance/decorators
- class
- accessor
- constructor
- parameter
- method
- parameter
- property
- invalid
- fourslash
- server
- shims
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
432 files changed
+8574
-3792
lines changedLarge diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
165 | 198 | | |
166 | 199 | | |
167 | 200 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
165 | 168 | | |
166 | 169 | | |
167 | 170 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
639 | 639 | | |
640 | 640 | | |
641 | 641 | | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
642 | 654 | | |
643 | 655 | | |
644 | 656 | | |
| |||
0 commit comments