mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-02-14 02:15:12 -06:00
60b7bbb6c5
Conflicts: bin/tsc.js bin/tsserver.js bin/typescript.js bin/typescriptServices.js src/compiler/checker.ts src/compiler/emitter.ts src/services/services.ts src/services/shims.ts tests/baselines/reference/classExpressionWithDecorator1.js tests/baselines/reference/decoratedClassFromExternalModule.js tests/baselines/reference/decoratorOnClass1.js tests/baselines/reference/decoratorOnClass2.js tests/baselines/reference/decoratorOnClass3.js tests/baselines/reference/decoratorOnClass4.js tests/baselines/reference/decoratorOnClass5.js tests/baselines/reference/decoratorOnClass8.js tests/baselines/reference/decoratorOnClassAccessor1.js tests/baselines/reference/decoratorOnClassAccessor2.js tests/baselines/reference/decoratorOnClassAccessor3.js tests/baselines/reference/decoratorOnClassAccessor4.js tests/baselines/reference/decoratorOnClassAccessor5.js tests/baselines/reference/decoratorOnClassAccessor6.js tests/baselines/reference/decoratorOnClassConstructorParameter1.js tests/baselines/reference/decoratorOnClassConstructorParameter4.js tests/baselines/reference/decoratorOnClassMethod1.js tests/baselines/reference/decoratorOnClassMethod10.js tests/baselines/reference/decoratorOnClassMethod11.js tests/baselines/reference/decoratorOnClassMethod12.js tests/baselines/reference/decoratorOnClassMethod13.js tests/baselines/reference/decoratorOnClassMethod2.js tests/baselines/reference/decoratorOnClassMethod3.js tests/baselines/reference/decoratorOnClassMethod4.js tests/baselines/reference/decoratorOnClassMethod5.js tests/baselines/reference/decoratorOnClassMethod6.js tests/baselines/reference/decoratorOnClassMethod7.js tests/baselines/reference/decoratorOnClassMethod8.js tests/baselines/reference/decoratorOnClassMethodParameter1.js tests/baselines/reference/decoratorOnClassProperty1.js tests/baselines/reference/decoratorOnClassProperty10.js tests/baselines/reference/decoratorOnClassProperty11.js tests/baselines/reference/decoratorOnClassProperty2.js tests/baselines/reference/decoratorOnClassProperty3.js tests/baselines/reference/decoratorOnClassProperty6.js tests/baselines/reference/decoratorOnClassProperty7.js tests/baselines/reference/missingDecoratorType.js tests/baselines/reference/sourceMapValidationDecorators.js tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt