Skip to content

Commit 2884086

Browse files
committed
Addressed PR feedback: refactored away helper function, generated spec from docx
1 parent eb87bad commit 2884086

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed
564 Bytes
Binary file not shown.

doc/spec.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ function f() {
265265

266266
To benefit from this inference, a programmer can use the TypeScript language service. For example, a code editor can incorporate the TypeScript language service and use the service to find the members of a string object as in the following screen shot.
267267

268-
  ![](images/image1.png)
268+
  ![](images/image1.png)
269269

270270
In this example, the programmer benefits from type inference without providing type annotations. Some beneficial tools, however, do require the programmer to provide type annotations. In TypeScript, we can express a parameter requirement as in the following code fragment.
271271

@@ -413,7 +413,7 @@ This signature denotes that a function may be passed as the parameter of the '$'
413413
414414
A typical client would not need to add any additional typing but could just use a community-supplied typing to discover (through statement completion with documentation tips) and verify (through static checking) correct use of the library, as in the following screen shot.
415415
416-
  ![](images/image2.png)
416+
  ![](images/image2.png)
417417
418418
Section [3.3](#3.3) provides additional information about object types.
419419
@@ -630,7 +630,7 @@ An important goal of TypeScript is to provide accurate and straightforward types
630630

631631
JavaScript programming interfaces often include functions whose behavior is discriminated by a string constant passed to the function. The Document Object Model makes heavy use of this pattern. For example, the following screen shot shows that the 'createElement' method of the 'document' object has multiple signatures, some of which identify the types returned when specific strings are passed into the method.
632632

633-
  ![](images/image3.png)
633+
  ![](images/image3.png)
634634

635635
The following code fragment uses this feature. Because the 'span' variable is inferred to have the type 'HTMLSpanElement', the code can reference without static error the 'isMultiline' property of 'span'.
636636

@@ -641,7 +641,7 @@ span.isMultiLine = false; // OK: HTMLSpanElement has isMultiline property
641641

642642
In the following screen shot, a programming tool combines information from overloading on string parameters with contextual typing to infer that the type of the variable 'e' is 'MouseEvent' and that therefore 'e' has a 'clientX' property.
643643

644-
  ![](images/image4.png)
644+
  ![](images/image4.png)
645645

646646
Section [3.9.2.4](#3.9.2.4) provides details on how to use string literals in function signatures.
647647

src/compiler/checker.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2466,10 +2466,6 @@ namespace ts {
24662466
return type && (type.flags & TypeFlags.Any) !== 0;
24672467
}
24682468

2469-
function isUnionContaining(type: Type, kinds: TypeFlags) {
2470-
return type && (type.flags & TypeFlags.Union) && someConstituentTypeHasKind(type, kinds);
2471-
}
2472-
24732469
// Return the type of a binding element parent. We check SymbolLinks first to see if a type has been
24742470
// assigned by contextual typing.
24752471
function getTypeForBindingElementParent(node: VariableLikeDeclaration) {
@@ -10217,7 +10213,7 @@ namespace ts {
1021710213
}
1021810214

1021910215
// Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
10220-
if (returnType === voidType || isTypeAny(returnType) || isUnionContaining(returnType, TypeFlags.Any) || isUnionContaining(returnType, TypeFlags.Void)) {
10216+
if (returnType === voidType || isTypeAny(returnType) || (returnType && (returnType.flags & TypeFlags.Union) && someConstituentTypeHasKind(returnType, TypeFlags.Any | TypeFlags.Void))) {
1022110217
return;
1022210218
}
1022310219

0 commit comments

Comments
 (0)