Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(972)

Unified Diff: pkg/analyzer/lib/src/task/html.dart

Issue 1347223002: Produce LINE_INFO for HTML files. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analyzer/lib/src/generated/source.dart ('k') | pkg/analyzer/test/src/task/html_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/task/html.dart
diff --git a/pkg/analyzer/lib/src/task/html.dart b/pkg/analyzer/lib/src/task/html.dart
index d1695605c0f45f8ef2d1dae94a07df16f1bd8376..0ab546a9c56b0653417ba65cb0f6456378d1b628 100644
--- a/pkg/analyzer/lib/src/task/html.dart
+++ b/pkg/analyzer/lib/src/task/html.dart
@@ -13,7 +13,6 @@ import 'package:analyzer/src/generated/java_engine.dart';
import 'package:analyzer/src/generated/scanner.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/plugin/engine_plugin.dart';
-import 'package:analyzer/src/task/dart.dart';
import 'package:analyzer/src/task/general.dart';
import 'package:analyzer/task/dart.dart';
import 'package:analyzer/task/general.dart';
@@ -280,7 +279,7 @@ class ParseHtmlTask extends SourceBasedAnalysisTask {
'ParseHtmlTask',
createTask,
buildInputs,
- <ResultDescriptor>[HTML_DOCUMENT, HTML_DOCUMENT_ERRORS]);
+ <ResultDescriptor>[HTML_DOCUMENT, HTML_DOCUMENT_ERRORS, LINE_INFO]);
/**
* Initialize a newly created task to access the content of the source
@@ -312,10 +311,14 @@ class ParseHtmlTask extends SourceBasedAnalysisTask {
new AnalysisError(
target.source, 0, 0, ScannerErrorCode.UNABLE_GET_CONTENT, [message])
];
+ outputs[LINE_INFO] = new LineInfo(<int>[0]);
} else {
HtmlParser parser = new HtmlParser(content, generateSpans: true);
parser.compatMode = 'quirks';
Document document = parser.parse();
+ //
+ // Convert errors.
+ //
List<ParseError> parseErrors = parser.errors;
List<AnalysisError> errors = <AnalysisError>[];
for (ParseError parseError in parseErrors) {
@@ -323,9 +326,12 @@ class ParseHtmlTask extends SourceBasedAnalysisTask {
errors.add(new AnalysisError(target.source, span.start.offset,
span.length, HtmlErrorCode.PARSE_ERROR, [parseError.message]));
}
-
+ //
+ // Record outputs.
+ //
outputs[HTML_DOCUMENT] = document;
outputs[HTML_DOCUMENT_ERRORS] = errors;
+ outputs[LINE_INFO] = _computeLineInfo(content);
}
}
@@ -345,6 +351,19 @@ class ParseHtmlTask extends SourceBasedAnalysisTask {
AnalysisContext context, AnalysisTarget target) {
return new ParseHtmlTask(context, target);
}
+
+ /**
+ * Compute [LineInfo] for the given [content].
+ */
+ static LineInfo _computeLineInfo(String content) {
+ List<int> lineStarts = <int>[0];
+ for (int index = 0; index < content.length; index++) {
+ if (content.codeUnitAt(index) == 0x0A) {
+ lineStarts.add(index + 1);
+ }
+ }
+ return new LineInfo(lineStarts);
+ }
}
/**
« no previous file with comments | « pkg/analyzer/lib/src/generated/source.dart ('k') | pkg/analyzer/test/src/task/html_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698