diff --git a/packages/compiler/src/template_parser/template_parser.ts b/packages/compiler/src/template_parser/template_parser.ts index 22736d68b6..fccec81903 100644 --- a/packages/compiler/src/template_parser/template_parser.ts +++ b/packages/compiler/src/template_parser/template_parser.ts @@ -140,13 +140,13 @@ export class TemplateParser { return this.tryParseHtml( this.expandHtml(this._htmlParser !.parse( template, templateUrl, true, this.getInterpolationConfig(component))), - component, template, directives, pipes, schemas, templateUrl); + component, directives, pipes, schemas); } tryParseHtml( - htmlAstWithErrors: ParseTreeResult, component: CompileDirectiveMetadata, template: string, - directives: CompileDirectiveSummary[], pipes: CompilePipeSummary[], schemas: SchemaMetadata[], - templateUrl: string): TemplateParseResult { + htmlAstWithErrors: ParseTreeResult, component: CompileDirectiveMetadata, + directives: CompileDirectiveSummary[], pipes: CompilePipeSummary[], + schemas: SchemaMetadata[]): TemplateParseResult { let result: TemplateAst[]; const errors = htmlAstWithErrors.errors; const usedPipes: CompilePipeSummary[] = []; diff --git a/packages/language-service/src/language_service.ts b/packages/language-service/src/language_service.ts index 36b60bb334..6cb1089ea1 100644 --- a/packages/language-service/src/language_service.ts +++ b/packages/language-service/src/language_service.ts @@ -8,12 +8,12 @@ import {CompileMetadataResolver, CompileNgModuleMetadata, CompilerConfig, DomElementSchemaRegistry, HtmlParser, I18NHtmlParser, Lexer, NgAnalyzedModules, Parser, TemplateParser} from '@angular/compiler'; -import {AstResult, AttrInfo, TemplateInfo} from './common'; +import {AstResult, TemplateInfo} from './common'; import {getTemplateCompletions} from './completions'; import {getDefinition} from './definitions'; import {getDeclarationDiagnostics, getTemplateDiagnostics} from './diagnostics'; import {getHover} from './hover'; -import {Completion, CompletionKind, Completions, Declaration, Declarations, Definition, Diagnostic, DiagnosticKind, Diagnostics, Hover, LanguageService, LanguageServiceHost, Location, PipeInfo, Pipes, Signature, Span, Symbol, SymbolDeclaration, SymbolQuery, SymbolTable, TemplateSource, TemplateSources} from './types'; +import {Completions, Definition, Diagnostic, DiagnosticKind, Diagnostics, Hover, LanguageService, LanguageServiceHost, Pipes, Span, TemplateSource} from './types'; /** @@ -126,8 +126,7 @@ class LanguageServiceImpl implements LanguageService { const pipes = ngModule.transitiveModule.pipes.map( p => this.host.resolver.getOrLoadPipeMetadata(p.reference).toSummary()); const schemas = ngModule.schemas; - const parseResult = parser.tryParseHtml( - htmlResult, metadata, template.source, directives, pipes, schemas, ''); + const parseResult = parser.tryParseHtml(htmlResult, metadata, directives, pipes, schemas); result = { htmlAst: htmlResult.rootNodes, templateAst: parseResult.templateAst,