Merge pull request #39984 from amcasey/pinned-release-3.6
Make release-3.6 buildable
This commit is contained in:
commit
eb6a1e030a
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -77,5 +77,4 @@ tests/cases/user/*/**/*.d.ts
|
|||
!tests/cases/user/discord.js/
|
||||
tests/baselines/reference/dt
|
||||
.failed-tests
|
||||
TEST-results.xml
|
||||
package-lock.json
|
||||
TEST-results.xml
|
|
@ -1,7 +1,7 @@
|
|||
language: node_js
|
||||
|
||||
node_js:
|
||||
- 'node'
|
||||
- '12'
|
||||
- '10'
|
||||
- '8'
|
||||
|
||||
|
@ -19,7 +19,7 @@ branches:
|
|||
install:
|
||||
- npm uninstall typescript --no-save
|
||||
- npm uninstall tslint --no-save
|
||||
- npm install
|
||||
- npm ci
|
||||
|
||||
cache:
|
||||
directories:
|
||||
|
|
7795
package-lock.json
generated
Normal file
7795
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load diff
|
@ -2844,6 +2844,7 @@ namespace ts {
|
|||
// If this is a property-parameter, then also declare the property symbol into the
|
||||
// containing class.
|
||||
if (isParameterPropertyDeclaration(node, node.parent)) {
|
||||
// tslint:disable-next-line no-unnecessary-type-assertion
|
||||
const classDeclaration = <ClassLikeDeclaration>node.parent.parent;
|
||||
declareSymbol(classDeclaration.symbol.members!, classDeclaration.symbol, node, SymbolFlags.Property | (node.questionToken ? SymbolFlags.Optional : SymbolFlags.None), SymbolFlags.PropertyExcludes);
|
||||
}
|
||||
|
|
|
@ -3638,10 +3638,12 @@ namespace ts {
|
|||
}
|
||||
|
||||
if (member.kind === SyntaxKind.GetAccessor && !getAccessor) {
|
||||
// tslint:disable-next-line no-unnecessary-type-assertion
|
||||
getAccessor = <GetAccessorDeclaration>member;
|
||||
}
|
||||
|
||||
if (member.kind === SyntaxKind.SetAccessor && !setAccessor) {
|
||||
// tslint:disable-next-line no-unnecessary-type-assertion
|
||||
setAccessor = <SetAccessorDeclaration>member;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue