Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
e17a7219
Unverified
Commit
e17a7219
authored
Jul 28, 2020
by
Michael Goderbauer
Committed by
GitHub
Jul 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ban unresolved dartdoc directives from HTML output (#62167)
parent
22739617
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
134 additions
and
8 deletions
+134
-8
dartdoc.dart
dev/tools/dartdoc.dart
+3
-0
dartdoc_checker.dart
dev/tools/dartdoc_checker.dart
+127
-0
ink_well.dart
packages/flutter/lib/src/material/ink_well.dart
+1
-1
gradient.dart
packages/flutter/lib/src/painting/gradient.dart
+1
-0
editable_text.dart
packages/flutter/lib/src/widgets/editable_text.dart
+0
-5
scroll_physics.dart
packages/flutter/lib/src/widgets/scroll_physics.dart
+1
-1
ticker_provider.dart
packages/flutter/lib/src/widgets/ticker_provider.dart
+1
-1
No files found.
dev/tools/dartdoc.dart
View file @
e17a7219
...
...
@@ -11,6 +11,8 @@ import 'package:intl/intl.dart';
import
'package:path/path.dart'
as
path
;
import
'package:process/process.dart'
;
import
'dartdoc_checker.dart'
;
const
String
kDocsRoot
=
'dev/docs'
;
const
String
kPublishRoot
=
'
$kDocsRoot
/doc'
;
const
String
kSnippetsRoot
=
'dev/snippets'
;
...
...
@@ -222,6 +224,7 @@ Future<void> main(List<String> arguments) async {
exit
(
exitCode
);
sanityCheckDocs
();
checkForUnresolvedDirectives
(
'
$kPublishRoot
/api'
);
createIndexAndCleanup
();
}
...
...
dev/tools/dartdoc_checker.dart
0 → 100644
View file @
e17a7219
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'dart:io'
;
import
'package:path/path.dart'
as
path
;
/// Scans the dartdoc HTML output in the provided `htmlOutputPath` for
/// unresolved dartdoc directives (`{@foo x y}`).
///
/// Dartdoc usually replaces those directives with other content. However,
/// if the directive is misspelled (or contains other errors) it is placed
/// verbatim into the HTML output. That's not desirable and this check verifies
/// that no directives appear verbatim in the output by checking that the
/// string `{@` does not appear in the HTML output outside of <code> sections.
///
/// The string `{@` is allowed in <code> sections, because those may contain
/// sample code where the sequence is perfectly legal, e.g. for required named
/// parameters of a method:
///
/// ```
/// void foo({@required int bar});
/// ```
void
checkForUnresolvedDirectives
(
String
htmlOutputPath
)
{
final
Directory
dartDocDir
=
Directory
(
htmlOutputPath
);
if
(!
dartDocDir
.
existsSync
())
{
throw
Exception
(
'Directory with dartdoc output (
${dartDocDir.path}
) does not exist.'
);
}
// Makes sure that the path we were given contains some of the expected
// libraries and HTML files.
final
List
<
String
>
canaryLibraries
=
<
String
>[
'animation'
,
'cupertino'
,
'material'
,
'widgets'
,
'rendering'
,
'flutter_driver'
,
];
final
List
<
String
>
canaryFiles
=
<
String
>[
'Widget-class.html'
,
'Material-class.html'
,
'Canvas-class.html'
,
];
print
(
'Scanning for unresolved dartdoc directives...'
);
final
List
<
FileSystemEntity
>
toScan
=
dartDocDir
.
listSync
();
int
count
=
0
;
while
(
toScan
.
isNotEmpty
)
{
final
FileSystemEntity
entity
=
toScan
.
removeLast
();
if
(
entity
is
File
)
{
if
(
path
.
extension
(
entity
.
path
)
!=
'.html'
)
{
continue
;
}
canaryFiles
.
remove
(
path
.
basename
(
entity
.
path
));
// TODO(goderbauer): Remove this exception when https://github.com/dart-lang/dartdoc/issues/2272 is fixed.
if
(
entity
.
path
.
endsWith
(
'-class.html'
)
||
entity
.
path
.
endsWith
(
'-library.html'
)
)
{
continue
;
}
count
+=
_scanFile
(
entity
);
}
else
if
(
entity
is
Directory
)
{
canaryLibraries
.
remove
(
path
.
basename
(
entity
.
path
));
toScan
.
addAll
(
entity
.
listSync
());
}
else
{
throw
Exception
(
'
$entity
is neither file nor directory.'
);
}
}
if
(
canaryLibraries
.
isNotEmpty
)
{
throw
Exception
(
'Did not find docs for the following libraries:
${canaryLibraries.join(', ')}
.'
);
}
if
(
canaryFiles
.
isNotEmpty
)
{
throw
Exception
(
'Did not find docs for the following files:
${canaryFiles.join(', ')}
.'
);
}
if
(
count
>
0
)
{
throw
Exception
(
'Found
$count
unresolved dartdoc directives (see log above).'
);
}
print
(
'No unresolved dartdoc directives detected.'
);
}
int
_scanFile
(
File
file
)
{
assert
(
path
.
extension
(
file
.
path
)
==
'html'
);
Iterable
<
String
>
matches
=
_pattern
.
allMatches
(
file
.
readAsStringSync
())
.
map
((
RegExpMatch
m
)
=>
m
.
group
(
0
));
// TODO(goderbauer): Remove this exception when https://github.com/dart-lang/dartdoc/issues/1945 is fixed.
matches
=
matches
.
where
((
String
m
)
=>
m
!=
'{@inject-html}'
)
.
where
((
String
m
)
=>
m
!=
'{@end-inject-html}'
);
if
(
matches
.
isNotEmpty
)
{
stderr
.
writeln
(
'Found unresolved dartdoc directives in
${file.path}
:'
);
for
(
final
String
match
in
matches
)
{
stderr
.
writeln
(
'
$match
'
);
}
}
return
matches
.
length
;
}
// Matches all `{@` that are not within `<code></code>` sections.
//
// This regex may lead to false positives if the docs ever contain nested tags
// inside <code> sections. Since we currently don't do that, doing the matching
// with a regex is a lot faster than using an HTML parser to strip out the
// <code> sections.
final
RegExp
_pattern
=
RegExp
(
r'({@[^}\n]*}?)(?![^<>]*</code)'
);
// Usually, the checker is invoked directly from `dartdoc.dart`. Main method
// is included for convenient local runs without having to regenerate
// the dartdocs every time.
//
// Provide the path to the dartdoc HTML output as an argument when running the
// program.
void
main
(
List
<
String
>
args
)
{
if
(
args
.
length
!=
1
)
{
throw
Exception
(
'Must provide the path to the dartdoc HTML output as argument.'
);
}
if
(!
Directory
(
args
.
single
).
existsSync
())
{
throw
Exception
(
'The dartdoc HTML output directory
${args.single}
does not exist.'
);
}
checkForUnresolvedDirectives
(
args
.
single
);
}
packages/flutter/lib/src/material/ink_well.dart
View file @
e17a7219
...
...
@@ -562,7 +562,7 @@ class InkResponse extends StatelessWidget {
/// {@macro flutter.widgets.Focus.focusNode}
final
FocusNode
focusNode
;
/// {@
template
flutter.widgets.Focus.canRequestFocus}
/// {@
macro
flutter.widgets.Focus.canRequestFocus}
final
bool
canRequestFocus
;
/// The rectangle to use for the highlight effect and for clipping
...
...
packages/flutter/lib/src/painting/gradient.dart
View file @
e17a7219
...
...
@@ -94,6 +94,7 @@ abstract class GradientTransform {
/// transform: GradientRotation(math.pi/4),
/// );
/// ```
/// {@end-tool}
@immutable
class
GradientRotation
extends
GradientTransform
{
/// Constructs a [GradientRotation] for the specified angle.
...
...
packages/flutter/lib/src/widgets/editable_text.dart
View file @
e17a7219
...
...
@@ -652,11 +652,6 @@ class EditableText extends StatefulWidget {
/// text.
///
/// Defaults to the ambient [Directionality], if any.
///
/// See also:
///
/// * {@macro flutter.gestures.monodrag.dragStartExample}
///
/// {@endtemplate}
final
TextDirection
textDirection
;
...
...
packages/flutter/lib/src/widgets/scroll_physics.dart
View file @
e17a7219
...
...
@@ -457,7 +457,7 @@ class RangeMaintainingScrollPhysics extends ScrollPhysics {
/// ```dart
/// BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics())
/// ```
///
(
@end-tool}
///
{
@end-tool}
///
/// See also:
///
...
...
packages/flutter/lib/src/widgets/ticker_provider.dart
View file @
e17a7219
...
...
@@ -43,7 +43,7 @@ class TickerMode extends StatelessWidget {
/// The widget below this widget in the tree.
///
/// {@
template
flutter.widgets.child}
/// {@
macro
flutter.widgets.child}
final
Widget
child
;
/// Whether tickers in the given subtree should be enabled or disabled.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment