mirror of
https://github.com/dart-lang/sdk
synced 2024-09-15 21:40:07 +00:00
Make Analyzer, VM and dart2js accept URI strings as part-of library identifier.
R=brianwilkerson@google.com, floitsch@google.com, hausner@google.com, johnniwinther@google.com, sigmund@google.com Review-Url: https://codereview.chromium.org/2640853005 .
This commit is contained in:
parent
bb72d5e8a0
commit
ef097edad6
|
@ -474,7 +474,8 @@ class LibraryAnalyzer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hasPartDirective && libraryNameNode == null) {
|
if (hasPartDirective && libraryNameNode == null &&
|
||||||
|
!_context.analysisOptions.enableUriInPartOf) {
|
||||||
libraryErrorReporter.reportErrorForOffset(
|
libraryErrorReporter.reportErrorForOffset(
|
||||||
ResolverErrorCode.MISSING_LIBRARY_DIRECTIVE_WITH_PART, 0, 0);
|
ResolverErrorCode.MISSING_LIBRARY_DIRECTIVE_WITH_PART, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1422,7 +1422,7 @@ class AnalysisOptionsImpl implements AnalysisOptions {
|
||||||
List<String> _excludePatterns;
|
List<String> _excludePatterns;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool enableUriInPartOf = false;
|
bool enableUriInPartOf = true;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool generateImplicitErrors = true;
|
bool generateImplicitErrors = true;
|
||||||
|
@ -1686,7 +1686,7 @@ class AnalysisOptionsImpl implements AnalysisOptions {
|
||||||
enableStrictCallChecks = false;
|
enableStrictCallChecks = false;
|
||||||
enableSuperMixins = false;
|
enableSuperMixins = false;
|
||||||
enableTiming = false;
|
enableTiming = false;
|
||||||
enableUriInPartOf = false;
|
enableUriInPartOf = true;
|
||||||
_errorProcessors = null;
|
_errorProcessors = null;
|
||||||
_excludePatterns = null;
|
_excludePatterns = null;
|
||||||
finerGrainedInvalidation = false;
|
finerGrainedInvalidation = false;
|
||||||
|
|
|
@ -208,7 +208,7 @@ class Parser {
|
||||||
* A flag indicating whether the parser is to allow URI's in part-of
|
* A flag indicating whether the parser is to allow URI's in part-of
|
||||||
* directives.
|
* directives.
|
||||||
*/
|
*/
|
||||||
bool _enableUriInPartOf = false;
|
bool _enableUriInPartOf = true;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A flag indicating whether parser is to parse function bodies.
|
* A flag indicating whether parser is to parse function bodies.
|
||||||
|
|
|
@ -1368,7 +1368,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void visitPartOfDirective(PartOfDirective node) {
|
void visitPartOfDirective(PartOfDirective node) {
|
||||||
isCoreLibrary = node.libraryName.name == 'dart.core';
|
isCoreLibrary = node.libraryName?.name == 'dart.core';
|
||||||
isPartOf = true;
|
isPartOf = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1626,7 +1626,8 @@ class BuildLibraryElementTask extends SourceBasedAnalysisTask {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (hasPartDirective && libraryNameNode == null) {
|
if (hasPartDirective && libraryNameNode == null &&
|
||||||
|
!context.analysisOptions.enableUriInPartOf) {
|
||||||
errors.add(new AnalysisError(librarySource, 0, 0,
|
errors.add(new AnalysisError(librarySource, 0, 0,
|
||||||
ResolverErrorCode.MISSING_LIBRARY_DIRECTIVE_WITH_PART));
|
ResolverErrorCode.MISSING_LIBRARY_DIRECTIVE_WITH_PART));
|
||||||
}
|
}
|
||||||
|
|
|
@ -3419,7 +3419,8 @@ class Foo {
|
||||||
|
|
||||||
void test_nonIdentifierLibraryName_partOf() {
|
void test_nonIdentifierLibraryName_partOf() {
|
||||||
CompilationUnit unit = parseCompilationUnit(
|
CompilationUnit unit = parseCompilationUnit(
|
||||||
"part of 'lib';", [ParserErrorCode.NON_IDENTIFIER_LIBRARY_NAME]);
|
"part of 3;", [ParserErrorCode.MISSING_NAME_IN_PART_OF_DIRECTIVE,
|
||||||
|
ParserErrorCode.UNEXPECTED_TOKEN]);
|
||||||
expect(unit, isNotNull);
|
expect(unit, isNotNull);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -766,9 +766,14 @@ library lib;
|
||||||
Source partSource = addSource("/part.dart", "part of 'lib';");
|
Source partSource = addSource("/part.dart", "part of 'lib';");
|
||||||
context.parseCompilationUnit(librarySource);
|
context.parseCompilationUnit(librarySource);
|
||||||
List<AnalysisError> errors = context.computeErrors(partSource);
|
List<AnalysisError> errors = context.computeErrors(partSource);
|
||||||
|
if (context.analysisOptions.enableUriInPartOf) {
|
||||||
|
// TODO(28522)
|
||||||
|
// Should report that 'lib' isn't the correct URI.
|
||||||
|
} else {
|
||||||
expect(errors, isNotNull);
|
expect(errors, isNotNull);
|
||||||
expect(errors.length > 0, isTrue);
|
expect(errors.length > 0, isTrue);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void test_computeErrors_dart_some() {
|
void test_computeErrors_dart_some() {
|
||||||
Source source = addSource("/lib.dart", "library 'lib';");
|
Source source = addSource("/lib.dart", "library 'lib';");
|
||||||
|
|
|
@ -414,10 +414,15 @@ part of lib;
|
||||||
|
|
||||||
AnalysisResult libResult = await driver.getResult(lib);
|
AnalysisResult libResult = await driver.getResult(lib);
|
||||||
List<AnalysisError> errors = libResult.errors;
|
List<AnalysisError> errors = libResult.errors;
|
||||||
|
if (libResult.unit.element.context.analysisOptions.enableUriInPartOf) {
|
||||||
|
// TODO(28522): Should cause an error for wrong library name.
|
||||||
|
expect(errors, hasLength(0));
|
||||||
|
} else {
|
||||||
expect(errors, hasLength(1));
|
expect(errors, hasLength(1));
|
||||||
expect(errors[0].errorCode,
|
expect(errors[0].errorCode,
|
||||||
ResolverErrorCode.MISSING_LIBRARY_DIRECTIVE_WITH_PART);
|
ResolverErrorCode.MISSING_LIBRARY_DIRECTIVE_WITH_PART);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
test_analyze_resolveDirectives_error_partOfDifferentLibrary_byName() async {
|
test_analyze_resolveDirectives_error_partOfDifferentLibrary_byName() async {
|
||||||
var lib = _p('/test/lib.dart');
|
var lib = _p('/test/lib.dart');
|
||||||
|
|
|
@ -870,8 +870,37 @@ part of my_lib;
|
||||||
part of my_lib;
|
part of my_lib;
|
||||||
'''
|
'''
|
||||||
});
|
});
|
||||||
|
if (context.analysisOptions.enableUriInPartOf) {
|
||||||
|
// TODO(28522)
|
||||||
|
// Should report that names are wrong.
|
||||||
|
} else {
|
||||||
_assertErrorsWithCodes(
|
_assertErrorsWithCodes(
|
||||||
[ResolverErrorCode.MISSING_LIBRARY_DIRECTIVE_WITH_PART]);
|
[ResolverErrorCode.MISSING_LIBRARY_DIRECTIVE_WITH_PART]);
|
||||||
|
AnalysisError error = errorListener.errors[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
test_perform_error_missingLibraryDirectiveWithPart_noCommon() {
|
||||||
|
_performBuildTask({
|
||||||
|
'/lib.dart': '''
|
||||||
|
part 'partA.dart';
|
||||||
|
part 'partB.dart';
|
||||||
|
''',
|
||||||
|
'/partA.dart': '''
|
||||||
|
part of libA;
|
||||||
|
''',
|
||||||
|
'/partB.dart': '''
|
||||||
|
part of libB;
|
||||||
|
'''
|
||||||
|
});
|
||||||
|
if (context.analysisOptions.enableUriInPartOf) {
|
||||||
|
// TODO(28522)
|
||||||
|
// Should report that names are wrong.
|
||||||
|
} else {
|
||||||
|
_assertErrorsWithCodes(
|
||||||
|
[ResolverErrorCode.MISSING_LIBRARY_DIRECTIVE_WITH_PART]);
|
||||||
|
AnalysisError error = errorListener.errors[0];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
test_perform_error_partDoesNotExist() {
|
test_perform_error_partDoesNotExist() {
|
||||||
|
|
|
@ -292,6 +292,7 @@ enum MessageKind {
|
||||||
LIBRARY_NOT_FOUND,
|
LIBRARY_NOT_FOUND,
|
||||||
LIBRARY_NOT_SUPPORTED,
|
LIBRARY_NOT_SUPPORTED,
|
||||||
LIBRARY_TAG_MUST_BE_FIRST,
|
LIBRARY_TAG_MUST_BE_FIRST,
|
||||||
|
LIBRARY_URI_MISMATCH,
|
||||||
MAIN_HAS_PART_OF,
|
MAIN_HAS_PART_OF,
|
||||||
MAIN_NOT_A_FUNCTION,
|
MAIN_NOT_A_FUNCTION,
|
||||||
MAIN_WITH_EXTRA_PARAMETER,
|
MAIN_WITH_EXTRA_PARAMETER,
|
||||||
|
@ -2073,6 +2074,26 @@ main() {}
|
||||||
""",
|
""",
|
||||||
'part.dart': """
|
'part.dart': """
|
||||||
part of lib.bar;
|
part of lib.bar;
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
]),
|
||||||
|
|
||||||
|
MessageKind.LIBRARY_URI_MISMATCH: const MessageTemplate(
|
||||||
|
MessageKind.LIBRARY_URI_MISMATCH,
|
||||||
|
"Expected URI of library '#{libraryUri}'.",
|
||||||
|
howToFix: "Try changing the directive to 'part of "
|
||||||
|
"\"#{libraryUri}\";'.",
|
||||||
|
examples: const [
|
||||||
|
const {
|
||||||
|
'main.dart': """
|
||||||
|
library lib.foo;
|
||||||
|
|
||||||
|
part 'part.dart';
|
||||||
|
|
||||||
|
main() {}
|
||||||
|
""",
|
||||||
|
'part.dart': """
|
||||||
|
part of "main.dart";
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
]),
|
]),
|
||||||
|
|
|
@ -767,6 +767,20 @@ class CompilationUnitElementX extends ElementX
|
||||||
}
|
}
|
||||||
partTag = tag;
|
partTag = tag;
|
||||||
LibraryName libraryTag = library.libraryTag;
|
LibraryName libraryTag = library.libraryTag;
|
||||||
|
|
||||||
|
Expression libraryReference = tag.name;
|
||||||
|
if (libraryReference is LiteralString) {
|
||||||
|
// Name is a URI. Resolve and compare to library's URI.
|
||||||
|
String content = libraryReference.dartString.slowToString();
|
||||||
|
Uri uri = this.script.readableUri.resolve(content);
|
||||||
|
Uri expectedUri = library.canonicalUri;
|
||||||
|
if (uri != expectedUri) {
|
||||||
|
// Consider finding a relative URI reference for the error message.
|
||||||
|
reporter.reportWarningMessage(tag.name,
|
||||||
|
MessageKind.LIBRARY_URI_MISMATCH, {'libraryUri': expectedUri});
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
String actualName = tag.name.toString();
|
String actualName = tag.name.toString();
|
||||||
if (libraryTag != null) {
|
if (libraryTag != null) {
|
||||||
String expectedName = libraryTag.name.toString();
|
String expectedName = libraryTag.name.toString();
|
||||||
|
|
|
@ -344,8 +344,13 @@ class Parser {
|
||||||
assert(optional('part', token));
|
assert(optional('part', token));
|
||||||
assert(optional('of', token.next));
|
assert(optional('of', token.next));
|
||||||
Token partKeyword = token;
|
Token partKeyword = token;
|
||||||
token = parseQualified(token.next.next, IdentifierContext.partName,
|
token = token.next.next;
|
||||||
|
if (token.isIdentifier()) {
|
||||||
|
token = parseQualified(token, IdentifierContext.partName,
|
||||||
IdentifierContext.partNameContinuation);
|
IdentifierContext.partNameContinuation);
|
||||||
|
} else {
|
||||||
|
token = parseLiteralStringOrRecoverExpression(token);
|
||||||
|
}
|
||||||
Token semicolon = token;
|
Token semicolon = token;
|
||||||
token = expect(';', token);
|
token = expect(';', token);
|
||||||
listener.endPartOf(partKeyword, semicolon);
|
listener.endPartOf(partKeyword, semicolon);
|
||||||
|
|
|
@ -6386,13 +6386,17 @@ void Parser::ParsePartHeader() {
|
||||||
ReportError("'part of' expected");
|
ReportError("'part of' expected");
|
||||||
}
|
}
|
||||||
ConsumeToken();
|
ConsumeToken();
|
||||||
// The VM is not required to check that the library name matches the
|
// The VM is not required to check that the library name or URI matches the
|
||||||
// name of the current library, so we ignore it.
|
// name or URI of the current library, so we ignore them.
|
||||||
|
if (CurrentToken() == Token::kSTRING) {
|
||||||
|
ParseStringLiteral(false);
|
||||||
|
} else {
|
||||||
ExpectIdentifier("library name expected");
|
ExpectIdentifier("library name expected");
|
||||||
while (CurrentToken() == Token::kPERIOD) {
|
while (CurrentToken() == Token::kPERIOD) {
|
||||||
ConsumeToken();
|
ConsumeToken();
|
||||||
ExpectIdentifier("malformed library name");
|
ExpectIdentifier("malformed library name");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
ExpectSemicolon();
|
ExpectSemicolon();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
9
tests/language/part_of_uri2_part.dart
Normal file
9
tests/language/part_of_uri2_part.dart
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
|
||||||
|
// for details. All rights reserved. Use of this source code is governed by a
|
||||||
|
// BSD-style license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
part of "part_of_uri2_test.dart";
|
||||||
|
|
||||||
|
// Refer to declaration in library and other part.
|
||||||
|
const bar1 = "part1";
|
||||||
|
const baz1 = "$foo${bar2}1";
|
9
tests/language/part_of_uri2_part2.dart
Normal file
9
tests/language/part_of_uri2_part2.dart
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
|
||||||
|
// for details. All rights reserved. Use of this source code is governed by a
|
||||||
|
// BSD-style license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
part of part_of_uri2;
|
||||||
|
|
||||||
|
// Refer to declaration in library and other part.
|
||||||
|
const bar2 = "part2";
|
||||||
|
const baz2 = "$foo${bar1}2";
|
15
tests/language/part_of_uri2_test.dart
Normal file
15
tests/language/part_of_uri2_test.dart
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
|
||||||
|
// for details. All rights reserved. Use of this source code is governed by a
|
||||||
|
// BSD-style license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
library part_of_uri2;
|
||||||
|
|
||||||
|
part "part_of_uri2_part.dart"; // declares bar1, baz1, uses URI.
|
||||||
|
part "part_of_uri2_part2.dart"; // declares bar2, baz2, uses id.
|
||||||
|
|
||||||
|
const foo = 'foo';
|
||||||
|
const qux = "$baz1$baz2";
|
||||||
|
|
||||||
|
main() {
|
||||||
|
if (!identical(qux, "foopart21foopart12")) throw "Fail: $qux";
|
||||||
|
}
|
9
tests/language/part_of_uri_part.dart
Normal file
9
tests/language/part_of_uri_part.dart
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
|
||||||
|
// for details. All rights reserved. Use of this source code is governed by a
|
||||||
|
// BSD-style license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
part of "part_of_uri_test.dart";
|
||||||
|
|
||||||
|
// Refer to declaration in library and other part.
|
||||||
|
const bar1 = "part1";
|
||||||
|
const baz1 = "$foo${bar2}1";
|
9
tests/language/part_of_uri_part2.dart
Normal file
9
tests/language/part_of_uri_part2.dart
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
|
||||||
|
// for details. All rights reserved. Use of this source code is governed by a
|
||||||
|
// BSD-style license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
part of "part_of_uri_test.dart";
|
||||||
|
|
||||||
|
// Refer to declaration in library and other part.
|
||||||
|
const bar2 = "part2";
|
||||||
|
const baz2 = "$foo${bar1}2";
|
14
tests/language/part_of_uri_test.dart
Normal file
14
tests/language/part_of_uri_test.dart
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
|
||||||
|
// for details. All rights reserved. Use of this source code is governed by a
|
||||||
|
// BSD-style license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
// No library declaration
|
||||||
|
part "part_of_uri_part.dart"; // declares bar1, baz1
|
||||||
|
part "part_of_uri_part2.dart"; // declares bar2, baz2
|
||||||
|
|
||||||
|
const foo = 'foo';
|
||||||
|
const qux = "$baz1$baz2";
|
||||||
|
|
||||||
|
main() {
|
||||||
|
if (!identical(qux, "foopart21foopart12")) throw "Fail: $qux";
|
||||||
|
}
|
Loading…
Reference in a new issue