cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(compiler): cleanup (#15960)

Browse Source
This commit is contained in:
Victor Berchet 2017-04-13 11:56:00 -07:00 committed by Tobias Bosch
parent 14b7dfa007
commit fdb3f26448
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/compiler/src/template_parser/template_parser.ts
View File

@ -140,13 +140,13 @@ export class TemplateParser {
return this.tryParseHtml( return this.tryParseHtml(
this.expandHtml(this._htmlParser !.parse( this.expandHtml(this._htmlParser !.parse(
template, templateUrl, true, this.getInterpolationConfig(component))), template, templateUrl, true, this.getInterpolationConfig(component))),
component, template, directives, pipes, schemas, templateUrl); component, directives, pipes, schemas);
} }
tryParseHtml( tryParseHtml(
htmlAstWithErrors: ParseTreeResult, component: CompileDirectiveMetadata, template: string, htmlAstWithErrors: ParseTreeResult, component: CompileDirectiveMetadata,
directives: CompileDirectiveSummary[], pipes: CompilePipeSummary[], schemas: SchemaMetadata[], directives: CompileDirectiveSummary[], pipes: CompilePipeSummary[],
templateUrl: string): TemplateParseResult { schemas: SchemaMetadata[]): TemplateParseResult {
let result: TemplateAst[]; let result: TemplateAst[];
const errors = htmlAstWithErrors.errors; const errors = htmlAstWithErrors.errors;
const usedPipes: CompilePipeSummary[] = []; const usedPipes: CompilePipeSummary[] = [];

7
packages/language-service/src/language_service.ts
View File

@ -8,12 +8,12 @@
import {CompileMetadataResolver, CompileNgModuleMetadata, CompilerConfig, DomElementSchemaRegistry, HtmlParser, I18NHtmlParser, Lexer, NgAnalyzedModules, Parser, TemplateParser} from '@angular/compiler'; 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 {getTemplateCompletions} from './completions';
import {getDefinition} from './definitions'; import {getDefinition} from './definitions';
import {getDeclarationDiagnostics, getTemplateDiagnostics} from './diagnostics'; import {getDeclarationDiagnostics, getTemplateDiagnostics} from './diagnostics';
import {getHover} from './hover'; 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( const pipes = ngModule.transitiveModule.pipes.map(
p => this.host.resolver.getOrLoadPipeMetadata(p.reference).toSummary()); p => this.host.resolver.getOrLoadPipeMetadata(p.reference).toSummary());
const schemas = ngModule.schemas; const schemas = ngModule.schemas;
const parseResult = parser.tryParseHtml( const parseResult = parser.tryParseHtml(htmlResult, metadata, directives, pipes, schemas);
htmlResult, metadata, template.source, directives, pipes, schemas, '');
result = { result = {
htmlAst: htmlResult.rootNodes, htmlAst: htmlResult.rootNodes,
templateAst: parseResult.templateAst, templateAst: parseResult.templateAst,