@angular/language-service 10.2.0 → 10.2.4

package/bundles/ivy.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v10.2.0
+ * @license Angular v10.2.4
  * Copyright Google LLC All Rights Reserved.
  * License: MIT
  */
@@ -6061,9 +6061,33 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
         }
     }
     class ParseSourceSpan {
-        constructor(start, end, details = null) {
+        /**
+         * Create an object that holds information about spans of tokens/nodes captured during
+         * lexing/parsing of text.
+         *
+         * @param start
+         * The location of the start of the span (having skipped leading trivia).
+         * Skipping leading trivia makes source-spans more "user friendly", since things like HTML
+         * elements will appear to begin at the start of the opening tag, rather than at the start of any
+         * leading trivia, which could include newlines.
+         *
+         * @param end
+         * The location of the end of the span.
+         *
+         * @param fullStart
+         * The start of the token without skipping the leading trivia.
+         * This is used by tooling that splits tokens further, such as extracting Angular interpolations
+         * from text tokens. Such tooling creates new source-spans relative to the original token's
+         * source-span. If leading trivia characters have been skipped then the new source-spans may be
+         * incorrectly offset.
+         *
+         * @param details
+         * Additional information (such as identifier names) that should be associated with the span.
+         */
+        constructor(start, end, fullStart = start, details = null) {
             this.start = start;
             this.end = end;
+            this.fullStart = fullStart;
             this.details = details;
         }
         toString() {
@@ -10225,7 +10249,8 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
             if (this.baseSourceSpan) {
                 const start = this.baseSourceSpan.start.moveBy(span.start);
                 const end = this.baseSourceSpan.start.moveBy(span.end);
-                return new ParseSourceSpan(start, end);
+                const fullStart = this.baseSourceSpan.fullStart.moveBy(span.start);
+                return new ParseSourceSpan(start, end, fullStart);
             }
             else {
                 return null;
@@ -11691,17 +11716,19 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
         }
         getSpan(start, leadingTriviaCodePoints) {
             start = start || this;
-            let cloned = false;
+            let fullStart = start;
             if (leadingTriviaCodePoints) {
                 while (this.diff(start) > 0 && leadingTriviaCodePoints.indexOf(start.peek()) !== -1) {
-                    if (!cloned) {
+                    if (fullStart === start) {
                         start = start.clone();
-                        cloned = true;
                     }
                     start.advance();
                 }
             }
-            return new ParseSourceSpan(new ParseLocation(start.file, start.state.offset, start.state.line, start.state.column), new ParseLocation(this.file, this.state.offset, this.state.line, this.state.column));
+            const startLocation = this.locationFromCursor(start);
+            const endLocation = this.locationFromCursor(this);
+            const fullStartLocation = fullStart !== start ? this.locationFromCursor(fullStart) : startLocation;
+            return new ParseSourceSpan(startLocation, endLocation, fullStartLocation);
         }
         getChars(start) {
             return this.input.substring(start.state.offset, this.state.offset);
@@ -11728,6 +11755,9 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
         updatePeek(state) {
             state.peek = state.offset >= this.end ? $EOF : this.charAt(state.offset);
         }
+        locationFromCursor(cursor) {
+            return new ParseLocation(cursor.file, cursor.state.offset, cursor.state.line, cursor.state.column);
+        }
     }
     class EscapedCharacterCursor extends PlainCharacterCursor {
         constructor(fileOrCursor, range) {
@@ -11985,7 +12015,7 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
                 this.errors.push(TreeError.create(null, this._peek.sourceSpan, `Invalid ICU message. Missing '}'.`));
                 return;
             }
-            const sourceSpan = new ParseSourceSpan(token.sourceSpan.start, this._peek.sourceSpan.end);
+            const sourceSpan = new ParseSourceSpan(token.sourceSpan.start, this._peek.sourceSpan.end, token.sourceSpan.fullStart);
             this._addToParent(new Expansion(switchValue.parts[0], type.parts[0], cases, sourceSpan, switchValue.sourceSpan));
             this._advance();
         }
@@ -12010,8 +12040,8 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
                 this.errors = this.errors.concat(expansionCaseParser.errors);
                 return null;
             }
-            const sourceSpan = new ParseSourceSpan(value.sourceSpan.start, end.sourceSpan.end);
-            const expSourceSpan = new ParseSourceSpan(start.sourceSpan.start, end.sourceSpan.end);
+            const sourceSpan = new ParseSourceSpan(value.sourceSpan.start, end.sourceSpan.end, value.sourceSpan.fullStart);
+            const expSourceSpan = new ParseSourceSpan(start.sourceSpan.start, end.sourceSpan.end, start.sourceSpan.fullStart);
             return new ExpansionCase(value.parts[0], expansionCaseParser.rootNodes, sourceSpan, value.sourceSpan, expSourceSpan);
         }
         _collectExpansionExpTokens(start) {
@@ -12092,8 +12122,10 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
                 selfClosing = false;
             }
             const end = this._peek.sourceSpan.start;
-            const span = new ParseSourceSpan(startTagToken.sourceSpan.start, end);
-            const el = new Element$1(fullName, attrs, [], span, span, undefined);
+            const span = new ParseSourceSpan(startTagToken.sourceSpan.start, end, startTagToken.sourceSpan.fullStart);
+            // Create a separate `startSpan` because `span` may be modified when there is an `end` span.
+            const startSpan = new ParseSourceSpan(startTagToken.sourceSpan.start, end, startTagToken.sourceSpan.fullStart);
+            const el = new Element$1(fullName, attrs, [], span, startSpan, undefined);
             this._pushElement(el);
             if (selfClosing) {
                 // Elements that are self-closed have their `endSourceSpan` set to the full span, as the
@@ -12154,7 +12186,7 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
                 const quoteToken = this._advance();
                 end = quoteToken.sourceSpan.end;
             }
-            return new Attribute(fullName, value, new ParseSourceSpan(attrName.sourceSpan.start, end), valueSpan);
+            return new Attribute(fullName, value, new ParseSourceSpan(attrName.sourceSpan.start, end, attrName.sourceSpan.fullStart), valueSpan);
         }
         _getParentElement() {
             return this._elementStack.length > 0 ? this._elementStack[this._elementStack.length - 1] : null;
@@ -12735,7 +12767,7 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
         // The difference of two absolute offsets provide the relative offset
         const startDiff = absoluteSpan.start - sourceSpan.start.offset;
         const endDiff = absoluteSpan.end - sourceSpan.end.offset;
-        return new ParseSourceSpan(sourceSpan.start.moveBy(startDiff), sourceSpan.end.moveBy(endDiff));
+        return new ParseSourceSpan(sourceSpan.start.moveBy(startDiff), sourceSpan.end.moveBy(endDiff), sourceSpan.fullStart.moveBy(startDiff), sourceSpan.details);
     }
 
     /**
@@ -14229,10 +14261,13 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
                 return;
             this.error(`Missing expected operator ${operator}`);
         }
+        prettyPrintToken(tok) {
+            return tok === EOF ? 'end of input' : `token ${tok}`;
+        }
         expectIdentifierOrKeyword() {
             const n = this.next;
             if (!n.isIdentifier() && !n.isKeyword()) {
-                this.error(`Unexpected token ${n}, expected identifier or keyword`);
+                this.error(`Unexpected ${this.prettyPrintToken(n)}, expected identifier or keyword`);
                 return '';
             }
             this.advance();
@@ -14241,7 +14276,7 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
         expectIdentifierOrKeywordOrString() {
             const n = this.next;
             if (!n.isIdentifier() && !n.isKeyword() && !n.isString()) {
-                this.error(`Unexpected token ${n}, expected identifier, keyword, or string`);
+                this.error(`Unexpected ${this.prettyPrintToken(n)}, expected identifier, keyword, or string`);
                 return '';
             }
             this.advance();
@@ -16241,7 +16276,7 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
         }
     }
     function getOffsetSourceSpan(sourceSpan, { start, end }) {
-        return new ParseSourceSpan(sourceSpan.start.moveBy(start), sourceSpan.start.moveBy(end));
+        return new ParseSourceSpan(sourceSpan.fullStart.moveBy(start), sourceSpan.fullStart.moveBy(end));
     }
     const _CUSTOM_PH_EXP = /\/\/[\s\S]*i18n[\s\S]*\([\s\S]*ph[\s\S]*=[\s\S]*("|')([\s\S]*?)\1[\s\S]*\)/g;
     function _extractPlaceholderName(input) {
@@ -16577,7 +16612,7 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
     function getSourceSpan(message) {
         const startNode = message.nodes[0];
         const endNode = message.nodes[message.nodes.length - 1];
-        return new ParseSourceSpan(startNode.sourceSpan.start, endNode.sourceSpan.end, startNode.sourceSpan.details);
+        return new ParseSourceSpan(startNode.sourceSpan.start, endNode.sourceSpan.end, startNode.sourceSpan.fullStart, startNode.sourceSpan.details);
     }
     /**
      * Convert the list of serialized MessagePieces into two arrays.
@@ -16604,7 +16639,7 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
                 placeHolders.push(part);
                 if (pieces[i - 1] instanceof PlaceholderPiece) {
                     // There were two placeholders in a row, so we need to add an empty message part.
-                    messageParts.push(createEmptyMessagePart(part.sourceSpan.end));
+                    messageParts.push(createEmptyMessagePart(pieces[i - 1].sourceSpan.end));
                 }
             }
         }
@@ -19163,7 +19198,7 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
      * Use of this source code is governed by an MIT-style license that can be
      * found in the LICENSE file at https://angular.io/license
      */
-    const VERSION$1 = new Version('10.2.0');
+    const VERSION$1 = new Version('10.2.4');
 
     /**
      * @license
@@ -19756,7 +19791,7 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
      * Use of this source code is governed by an MIT-style license that can be
      * found in the LICENSE file at https://angular.io/license
      */
-    const VERSION$2 = new Version('10.2.0');
+    const VERSION$2 = new Version('10.2.4');
 
     /**
      * @license
@@ -20175,12 +20210,20 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
      */
     class LocalIdentifierStrategy {
         emit(ref, context, importFlags) {
+            const refSf = getSourceFile(ref.node);
             // If the emitter has specified ForceNewImport, then LocalIdentifierStrategy should not use a
             // local identifier at all, *except* in the source file where the node is actually declared.
-            if (importFlags & ImportFlags.ForceNewImport &&
-                getSourceFile(ref.node) !== getSourceFile(context)) {
+            if (importFlags & ImportFlags.ForceNewImport && refSf !== context) {
                 return null;
             }
+            // If referenced node is not an actual TS declaration (e.g. `class Foo` or `function foo() {}`,
+            // etc) and it is in the current file then just use it directly.
+            // This is important because the reference could be a property access (e.g. `exports.foo`). In
+            // such a case, the reference's `identities` property would be `[foo]`, which would result in an
+            // invalid emission of a free-standing `foo` identifier, rather than `exports.foo`.
+            if (!isDeclaration(ref.node) && refSf === context) {
+                return new WrappedNodeExpr(ref.node);
+            }
             // A Reference can have multiple identities in different files, so it may already have an
             // Identifier in the requested context file.
             const identifier = ref.getIdentityIn(context);
@@ -23061,10 +23104,12 @@ define(['exports', 'os', 'typescript', 'fs', 'constants', 'stream', 'util', 'ass
             });
         }
         visitAmbiguousDeclaration(decl, declContext) {
-            return decl.kind === 1 /* Inline */ && decl.implementation !== undefined ?
-                // Inline declarations with an `implementation` should be visited as expressions
+            return decl.kind === 1 /* Inline */ && decl.implementation !== undefined &&
+                !isDeclaration(decl.implementation) ?
+                // Inline declarations whose `implementation` is a `ts.Expression` should be visited as
+                // an expression.
                 this.visitExpression(decl.implementation, declContext) :
-                // Otherwise just visit the declaration `node`
+                // Otherwise just visit the `node` as a declaration.
                 this.visitDeclaration(decl.node, declContext);
         }
         accessHelper(node, lhs, rhs, context) {
@@ -32076,6 +32121,11 @@ Either add the @Injectable() decorator to '${provider.node.name
         constructor(resolver) {
             this.resolver = resolver;
             this._diagnostics = [];
+            /**
+             * Tracks which `BindingPipe` nodes have already been recorded as invalid, so only one diagnostic
+             * is ever produced per node.
+             */
+            this.recordedPipes = new Set();
         }
         get diagnostics() {
             return this._diagnostics;
@@ -32087,6 +32137,9 @@ Either add the @Injectable() decorator to '${provider.node.name
             this._diagnostics.push(makeTemplateDiagnostic(templateId, mapping, ref.valueSpan || ref.sourceSpan, ts.DiagnosticCategory.Error, ngErrorCode(ErrorCode.MISSING_REFERENCE_TARGET), errorMsg));
         }
         missingPipe(templateId, ast) {
+            if (this.recordedPipes.has(ast)) {
+                return;
+            }
             const mapping = this.resolver.getSourceMapping(templateId);
             const errorMsg = `No pipe found with name '${ast.name}'.`;
             const sourceSpan = this.resolver.toParseSourceSpan(templateId, ast.nameSpan);
@@ -32094,6 +32147,7 @@ Either add the @Injectable() decorator to '${provider.node.name
                 throw new Error(`Assertion failure: no SourceLocation found for usage of pipe '${ast.name}'.`);
             }
             this._diagnostics.push(makeTemplateDiagnostic(templateId, mapping, sourceSpan, ts.DiagnosticCategory.Error, ngErrorCode(ErrorCode.MISSING_PIPE), errorMsg));
+            this.recordedPipes.add(ast);
         }
         illegalAssignmentToTemplateVar(templateId, assignment, target) {
             const mapping = this.resolver.getSourceMapping(templateId);
@@ -33505,7 +33559,7 @@ Either add the @Injectable() decorator to '${provider.node.name
             if (!this.pipes.has(name)) {
                 return null;
             }
-            return this.env.pipeInst(this.pipes.get(name));
+            return this.pipes.get(name);
         }
     }
     /**
@@ -33961,18 +34015,21 @@ Either add the @Injectable() decorator to '${provider.node.name
             }
             else if (ast instanceof BindingPipe) {
                 const expr = this.translate(ast.exp);
+                const pipeRef = this.tcb.getPipeByName(ast.name);
                 let pipe;
-                if (this.tcb.env.config.checkTypeOfPipes) {
-                    pipe = this.tcb.getPipeByName(ast.name);
-                    if (pipe === null) {
-                        // No pipe by that name exists in scope. Record this as an error.
-                        this.tcb.oobRecorder.missingPipe(this.tcb.id, ast);
-                        // Return an 'any' value to at least allow the rest of the expression to be checked.
-                        pipe = NULL_AS_ANY;
-                    }
+                if (pipeRef === null) {
+                    // No pipe by that name exists in scope. Record this as an error.
+                    this.tcb.oobRecorder.missingPipe(this.tcb.id, ast);
+                    // Use an 'any' value to at least allow the rest of the expression to be checked.
+                    pipe = NULL_AS_ANY;
+                }
+                else if (this.tcb.env.config.checkTypeOfPipes) {
+                    // Use a variable declared as the pipe's type.
+                    pipe = this.tcb.env.pipeInst(pipeRef);
                 }
                 else {
-                    pipe = ts.createParen(ts.createAsExpression(ts.createNull(), ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)));
+                    // Use an 'any' value when not checking the type of the pipe.
+                    pipe = NULL_AS_ANY;
                 }
                 const args = ast.args.map(arg => this.translate(arg));
                 const result = tsCallMethod(pipe, 'transform', [expr, ...args]);

package/bundles/language-service.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v10.2.0
+ * @license Angular v10.2.4
  * Copyright Google LLC All Rights Reserved.
  * License: MIT
  */
@@ -3294,9 +3294,33 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
         }
     }
     class ParseSourceSpan {
-        constructor(start, end, details = null) {
+        /**
+         * Create an object that holds information about spans of tokens/nodes captured during
+         * lexing/parsing of text.
+         *
+         * @param start
+         * The location of the start of the span (having skipped leading trivia).
+         * Skipping leading trivia makes source-spans more "user friendly", since things like HTML
+         * elements will appear to begin at the start of the opening tag, rather than at the start of any
+         * leading trivia, which could include newlines.
+         *
+         * @param end
+         * The location of the end of the span.
+         *
+         * @param fullStart
+         * The start of the token without skipping the leading trivia.
+         * This is used by tooling that splits tokens further, such as extracting Angular interpolations
+         * from text tokens. Such tooling creates new source-spans relative to the original token's
+         * source-span. If leading trivia characters have been skipped then the new source-spans may be
+         * incorrectly offset.
+         *
+         * @param details
+         * Additional information (such as identifier names) that should be associated with the span.
+         */
+        constructor(start, end, fullStart = start, details = null) {
             this.start = start;
             this.end = end;
+            this.fullStart = fullStart;
             this.details = details;
         }
         toString() {
@@ -7449,7 +7473,8 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
             if (this.baseSourceSpan) {
                 const start = this.baseSourceSpan.start.moveBy(span.start);
                 const end = this.baseSourceSpan.start.moveBy(span.end);
-                return new ParseSourceSpan(start, end);
+                const fullStart = this.baseSourceSpan.fullStart.moveBy(span.start);
+                return new ParseSourceSpan(start, end, fullStart);
             }
             else {
                 return null;
@@ -9002,17 +9027,19 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
         }
         getSpan(start, leadingTriviaCodePoints) {
             start = start || this;
-            let cloned = false;
+            let fullStart = start;
             if (leadingTriviaCodePoints) {
                 while (this.diff(start) > 0 && leadingTriviaCodePoints.indexOf(start.peek()) !== -1) {
-                    if (!cloned) {
+                    if (fullStart === start) {
                         start = start.clone();
-                        cloned = true;
                     }
                     start.advance();
                 }
             }
-            return new ParseSourceSpan(new ParseLocation(start.file, start.state.offset, start.state.line, start.state.column), new ParseLocation(this.file, this.state.offset, this.state.line, this.state.column));
+            const startLocation = this.locationFromCursor(start);
+            const endLocation = this.locationFromCursor(this);
+            const fullStartLocation = fullStart !== start ? this.locationFromCursor(fullStart) : startLocation;
+            return new ParseSourceSpan(startLocation, endLocation, fullStartLocation);
         }
         getChars(start) {
             return this.input.substring(start.state.offset, this.state.offset);
@@ -9039,6 +9066,9 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
         updatePeek(state) {
             state.peek = state.offset >= this.end ? $EOF : this.charAt(state.offset);
         }
+        locationFromCursor(cursor) {
+            return new ParseLocation(cursor.file, cursor.state.offset, cursor.state.line, cursor.state.column);
+        }
     }
     class EscapedCharacterCursor extends PlainCharacterCursor {
         constructor(fileOrCursor, range) {
@@ -9296,7 +9326,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
                 this.errors.push(TreeError.create(null, this._peek.sourceSpan, `Invalid ICU message. Missing '}'.`));
                 return;
             }
-            const sourceSpan = new ParseSourceSpan(token.sourceSpan.start, this._peek.sourceSpan.end);
+            const sourceSpan = new ParseSourceSpan(token.sourceSpan.start, this._peek.sourceSpan.end, token.sourceSpan.fullStart);
             this._addToParent(new Expansion(switchValue.parts[0], type.parts[0], cases, sourceSpan, switchValue.sourceSpan));
             this._advance();
         }
@@ -9321,8 +9351,8 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
                 this.errors = this.errors.concat(expansionCaseParser.errors);
                 return null;
             }
-            const sourceSpan = new ParseSourceSpan(value.sourceSpan.start, end.sourceSpan.end);
-            const expSourceSpan = new ParseSourceSpan(start.sourceSpan.start, end.sourceSpan.end);
+            const sourceSpan = new ParseSourceSpan(value.sourceSpan.start, end.sourceSpan.end, value.sourceSpan.fullStart);
+            const expSourceSpan = new ParseSourceSpan(start.sourceSpan.start, end.sourceSpan.end, start.sourceSpan.fullStart);
             return new ExpansionCase(value.parts[0], expansionCaseParser.rootNodes, sourceSpan, value.sourceSpan, expSourceSpan);
         }
         _collectExpansionExpTokens(start) {
@@ -9403,8 +9433,10 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
                 selfClosing = false;
             }
             const end = this._peek.sourceSpan.start;
-            const span = new ParseSourceSpan(startTagToken.sourceSpan.start, end);
-            const el = new Element$1(fullName, attrs, [], span, span, undefined);
+            const span = new ParseSourceSpan(startTagToken.sourceSpan.start, end, startTagToken.sourceSpan.fullStart);
+            // Create a separate `startSpan` because `span` may be modified when there is an `end` span.
+            const startSpan = new ParseSourceSpan(startTagToken.sourceSpan.start, end, startTagToken.sourceSpan.fullStart);
+            const el = new Element$1(fullName, attrs, [], span, startSpan, undefined);
             this._pushElement(el);
             if (selfClosing) {
                 // Elements that are self-closed have their `endSourceSpan` set to the full span, as the
@@ -9465,7 +9497,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
                 const quoteToken = this._advance();
                 end = quoteToken.sourceSpan.end;
             }
-            return new Attribute(fullName, value, new ParseSourceSpan(attrName.sourceSpan.start, end), valueSpan);
+            return new Attribute(fullName, value, new ParseSourceSpan(attrName.sourceSpan.start, end, attrName.sourceSpan.fullStart), valueSpan);
         }
         _getParentElement() {
             return this._elementStack.length > 0 ? this._elementStack[this._elementStack.length - 1] : null;
@@ -10848,7 +10880,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
         // The difference of two absolute offsets provide the relative offset
         const startDiff = absoluteSpan.start - sourceSpan.start.offset;
         const endDiff = absoluteSpan.end - sourceSpan.end.offset;
-        return new ParseSourceSpan(sourceSpan.start.moveBy(startDiff), sourceSpan.end.moveBy(endDiff));
+        return new ParseSourceSpan(sourceSpan.start.moveBy(startDiff), sourceSpan.end.moveBy(endDiff), sourceSpan.fullStart.moveBy(startDiff), sourceSpan.details);
     }
 
     /**
@@ -11335,7 +11367,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
             const matchedReferences = new Set();
             let component = null;
             const directiveAsts = directives.map((directive) => {
-                const sourceSpan = new ParseSourceSpan(elementSourceSpan.start, elementSourceSpan.end, `Directive ${identifierName(directive.type)}`);
+                const sourceSpan = new ParseSourceSpan(elementSourceSpan.start, elementSourceSpan.end, elementSourceSpan.fullStart, `Directive ${identifierName(directive.type)}`);
                 if (directive.isComponent) {
                     component = directive;
                 }
@@ -13026,10 +13058,13 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
                 return;
             this.error(`Missing expected operator ${operator}`);
         }
+        prettyPrintToken(tok) {
+            return tok === EOF ? 'end of input' : `token ${tok}`;
+        }
         expectIdentifierOrKeyword() {
             const n = this.next;
             if (!n.isIdentifier() && !n.isKeyword()) {
-                this.error(`Unexpected token ${n}, expected identifier or keyword`);
+                this.error(`Unexpected ${this.prettyPrintToken(n)}, expected identifier or keyword`);
                 return '';
             }
             this.advance();
@@ -13038,7 +13073,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
         expectIdentifierOrKeywordOrString() {
             const n = this.next;
             if (!n.isIdentifier() && !n.isKeyword() && !n.isString()) {
-                this.error(`Unexpected token ${n}, expected identifier, keyword, or string`);
+                this.error(`Unexpected ${this.prettyPrintToken(n)}, expected identifier, keyword, or string`);
                 return '';
             }
             this.advance();
@@ -15038,7 +15073,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
         }
     }
     function getOffsetSourceSpan(sourceSpan, { start, end }) {
-        return new ParseSourceSpan(sourceSpan.start.moveBy(start), sourceSpan.start.moveBy(end));
+        return new ParseSourceSpan(sourceSpan.fullStart.moveBy(start), sourceSpan.fullStart.moveBy(end));
     }
     const _CUSTOM_PH_EXP = /\/\/[\s\S]*i18n[\s\S]*\([\s\S]*ph[\s\S]*=[\s\S]*("|')([\s\S]*?)\1[\s\S]*\)/g;
     function _extractPlaceholderName(input) {
@@ -15374,7 +15409,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
     function getSourceSpan(message) {
         const startNode = message.nodes[0];
         const endNode = message.nodes[message.nodes.length - 1];
-        return new ParseSourceSpan(startNode.sourceSpan.start, endNode.sourceSpan.end, startNode.sourceSpan.details);
+        return new ParseSourceSpan(startNode.sourceSpan.start, endNode.sourceSpan.end, startNode.sourceSpan.fullStart, startNode.sourceSpan.details);
     }
     /**
      * Convert the list of serialized MessagePieces into two arrays.
@@ -15401,7 +15436,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
                 placeHolders.push(part);
                 if (pieces[i - 1] instanceof PlaceholderPiece) {
                     // There were two placeholders in a row, so we need to add an empty message part.
-                    messageParts.push(createEmptyMessagePart(part.sourceSpan.end));
+                    messageParts.push(createEmptyMessagePart(pieces[i - 1].sourceSpan.end));
                 }
             }
         }
@@ -17960,7 +17995,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
      * Use of this source code is governed by an MIT-style license that can be
      * found in the LICENSE file at https://angular.io/license
      */
-    const VERSION$1 = new Version('10.2.0');
+    const VERSION$1 = new Version('10.2.4');
 
     /**
      * @license
@@ -27242,6 +27277,56 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
         assertNumber(lView[injectorIndex + 8 /* PARENT */], 'injectorIndex should point to parent injector');
     }
 
+    /**
+     * @license
+     * Copyright Google LLC All Rights Reserved.
+     *
+     * Use of this source code is governed by an MIT-style license that can be
+     * found in the LICENSE file at https://angular.io/license
+     */
+    /**
+     * Used for stringify render output in Ivy.
+     * Important! This function is very performance-sensitive and we should
+     * be extra careful not to introduce megamorphic reads in it.
+     */
+    function renderStringify(value) {
+        if (typeof value === 'string')
+            return value;
+        if (value == null)
+            return '';
+        return '' + value;
+    }
+    /**
+     * Used to stringify a value so that it can be displayed in an error message.
+     * Important! This function contains a megamorphic read and should only be
+     * used for error messages.
+     */
+    function stringifyForError(value) {
+        if (typeof value === 'function')
+            return value.name || value.toString();
+        if (typeof value === 'object' && value != null && typeof value.type === 'function') {
+            return value.type.name || value.type.toString();
+        }
+        return renderStringify(value);
+    }
+    const ɵ0$2 = () => (typeof requestAnimationFrame !== 'undefined' &&
+        requestAnimationFrame || // browser only
+        setTimeout // everything else
+    )
+        .bind(_global$1);
+    const defaultScheduler = (ɵ0$2)();
+
+    /** Called when directives inject each other (creating a circular dependency) */
+    function throwCyclicDependencyError(token, path) {
+        const depPath = path ? `. Dependency path: ${path.join(' > ')} > ${token}` : '';
+        throw new Error(`Circular dependency in DI detected for ${token}${depPath}`);
+    }
+    /** Throws an error when a token is not found in DI. */
+    function throwProviderNotFoundError(token, injectorName) {
+        const injectorDetails = injectorName ? ` in ${injectorName}` : '';
+        throw new Error(`No provider for ${stringifyForError(token)} found${injectorDetails}`);
+    }
+
     /**
      * @license
      * Copyright Google LLC All Rights Reserved.
@@ -27396,11 +27481,11 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
     function isProceduralRenderer(renderer) {
         return !!(renderer.listen);
     }
-    const ɵ0$2 = (hostElement, rendererType) => {
+    const ɵ0$3 = (hostElement, rendererType) => {
         return getDocument();
     };
     const domRendererFactory3 = {
-        createRenderer: ɵ0$2
+        createRenderer: ɵ0$3
     };
 
     /**
@@ -28227,45 +28312,6 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
         return parentView;
     }
 
-    /**
-     * @license
-     * Copyright Google LLC All Rights Reserved.
-     *
-     * Use of this source code is governed by an MIT-style license that can be
-     * found in the LICENSE file at https://angular.io/license
-     */
-    /**
-     * Used for stringify render output in Ivy.
-     * Important! This function is very performance-sensitive and we should
-     * be extra careful not to introduce megamorphic reads in it.
-     */
-    function renderStringify(value) {
-        if (typeof value === 'string')
-            return value;
-        if (value == null)
-            return '';
-        return '' + value;
-    }
-    /**
-     * Used to stringify a value so that it can be displayed in an error message.
-     * Important! This function contains a megamorphic read and should only be
-     * used for error messages.
-     */
-    function stringifyForError(value) {
-        if (typeof value === 'function')
-            return value.name || value.toString();
-        if (typeof value === 'object' && value != null && typeof value.type === 'function') {
-            return value.type.name || value.type.toString();
-        }
-        return renderStringify(value);
-    }
-    const ɵ0$3 = () => (typeof requestAnimationFrame !== 'undefined' &&
-        requestAnimationFrame || // browser only
-        setTimeout // everything else
-    )
-        .bind(_global$1);
-    const defaultScheduler = (ɵ0$3)();
-
     /**
      * @license
      * Copyright Google LLC All Rights Reserved.
@@ -28515,7 +28561,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
                 try {
                     const value = bloomHash();
                     if (value == null && !(flags & InjectFlags.Optional)) {
-                        throw new Error(`No provider for ${stringifyForError(token)}!`);
+                        throwProviderNotFoundError(token);
                     }
                     else {
                         return value;
@@ -28614,7 +28660,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
             return notFoundValue;
         }
         else {
-            throw new Error(`NodeInjector: NOT_FOUND [${stringifyForError(token)}]`);
+            throwProviderNotFoundError(token, 'NodeInjector');
         }
     }
     const NOT_FOUND = {};
@@ -28698,7 +28744,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
         if (isFactory(value)) {
             const factory = value;
             if (factory.resolving) {
-                throw new Error(`Circular dep for ${stringifyForError(tData[index])}`);
+                throwCyclicDependencyError(stringifyForError(tData[index]));
             }
             const previousIncludeViewProviders = setIncludeViewProviders(factory.canSeeViewProviders);
             factory.resolving = true;
@@ -34101,7 +34147,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
     /**
      * @publicApi
      */
-    const VERSION$2 = new Version$1('10.2.0');
+    const VERSION$2 = new Version$1('10.2.4');
 
     /**
      * @license
@@ -38989,7 +39035,7 @@ define(['exports', 'typescript/lib/tsserverlibrary', 'typescript', 'path'], func
      * Use of this source code is governed by an MIT-style license that can be
      * found in the LICENSE file at https://angular.io/license
      */
-    if (ngDevMode) {
+    if (typeof ngDevMode !== 'undefined' && ngDevMode) {
         // This helper is to give a reasonable error message to people upgrading to v9 that have not yet
         // installed `@angular/localize` in their app.
         // tslint:disable-next-line: no-toplevel-property-access

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/language-service",
-  "version": "10.2.0",
+  "version": "10.2.4",
   "description": "Angular - language services",
   "main": "./bundles/language-service.js",
   "typings": "./index.d.ts",