add markdown and more test cases

Author: jcollins-g

lib/src/generator/templates.dart

@@ -70,6 +70,10 @@ const _partials_md = <String>[
   'property',
   'source_code',
   'source_link',
+  'type',
+  'type_multiline',
+  'typedef',
+  'typedef_multiline',
 ];
 
 abstract class _TemplatesLoader {

lib/templates/md/_type.md

@@ -0,0 +1,5 @@
+##### {{{linkedName}}}{{{linkedGenericParameters}}}({{{ linkedParamsNoMetadata }}}) {{{ linkedReturnType }}}
+{{>categorization}}
+
+{{{ oneLineDoc }}} {{{ extendedDocLink }}}  {{!two spaces intentional}}
+{{>features}}

lib/templates/md/_type_multiline.md

@@ -0,0 +1,7 @@
+{{#hasAnnotations}}
+{{#annotations}}
+- {{{.}}}
+{{/annotations}}
+{{/hasAnnotations}}
+
+{{>name_summary}}{{{genericParameters}}} = {{{linkedReturnType}}}

lib/templates/md/_typedef.md

@@ -0,0 +1,6 @@
+{{#isCallable}}
+  {{>callable}}
+{{/isCallable}}
+{{^isCallable}}
+  {{>type}}
+{{/isCallable}}

lib/templates/md/_typedef_multiline.md

@@ -0,0 +1,6 @@
+{{#isCallable}}
+  {{>callable_multiline}}
+{{/isCallable}}
+{{^isCallable}}
+  {{>type_multiline}}
+{{/isCallable}}

lib/templates/md/category.md

@@ -72,7 +72,7 @@
 ## Typedefs
 
 {{#publicTypedefsSorted}}
-{{>callable}}
+{{>typedef}}
 
 {{/publicTypedefsSorted}}
 {{/hasPublicTypedefs}}

lib/templates/md/library.md

@@ -79,7 +79,7 @@
 ## Typedefs
 
 {{#library.publicTypedefsSorted}}
-{{>callable}}
+{{>typedef}}
 
 {{/library.publicTypedefsSorted}}
 {{/library.hasPublicTypedefs}}

lib/templates/md/typedef.md

@@ -9,7 +9,7 @@
 {{/self}}
 
 {{#typeDef}}
-{{>callable_multiline}}
+{{>typedef_multiline}}
 
 {{>documentation}}
 

pubspec.yaml

@@ -7,7 +7,7 @@ environment:
   sdk: '>=2.11.99 <3.0.0'
 
 dependencies:
-  analyzer: ^1.0.0
+  analyzer: ^1.1.0
   args: ^2.0.0
   charcode: ^1.2.0
   collection: ^1.2.0
@@ -40,18 +40,3 @@ dev_dependencies:
 
 executables:
   dartdoc: null
-
-dependency_overrides:
-  args: ^2.0.0-nullsafety.0
-  cli_util: ^0.3.0-nullsafety.0
-  crypto: ^3.0.0-nullsafety.0
-  glob: ^2.0.0-nullsafety.0
-  package_config: ^2.0.0-nullsafety.0
-  pub_semver: ^2.0.0-nullsafety.0
-  yaml: ^3.0.0-nullsafety.0
-  analyzer:
-    path: '/Users/jcollins/dart/sdk/sdk/pkg/analyzer'
-  _fe_analyzer_shared:
-    path: '/Users/jcollins/dart/sdk/sdk/pkg/_fe_analyzer_shared'
-  #meta:
-  #  path: '/Users/jcollins/dart/sdk/sdk/pkg/meta'

test/end2end/model_special_cases_test.dart

@@ -97,20 +97,20 @@ void main() {
         T7 = generalizedTypedefs.typedefs.firstWhere((a) => a.name == 'T7');
       });
 
-      void expectTypedefs(Typedef t, String modelTypeToString, String genericParameters) {
+      void expectTypedefs(Typedef t, String modelTypeToString, Iterable<String> genericParameters) {
         expect(t.modelType.toString(), equals(modelTypeToString));
-        expect(t.genericParameters, equals(genericParameters));
+        expect(t.genericTypeParameters.map((p) => p.toString()), orderedEquals(genericParameters));
       }
 
       test('basic non-function typedefs work', () {
-        expectTypedefs(T0, 'void', '');
-        expectTypedefs(T1, 'Function', '');
-        expectTypedefs(T2, 'List<X>', '');
-        expectTypedefs(T3, '', '');
-        expectTypedefs(T4, '', '');
-        expectTypedefs(T5, '', '');
-        expectTypedefs(T6, '', '');
-        expectTypedefs(T7, '', '');
+        expectTypedefs(T0, 'void', []);
+        expectTypedefs(T1, 'Function', []);
+        expectTypedefs(T2, 'List<X>', ['out X']);
+        expectTypedefs(T3, 'Map<X, Y>', ['out X', 'out Y']);
+        expectTypedefs(T4, 'void Function()', []);
+        expectTypedefs(T5, 'X Function(X, {X name})', ['inout X']);
+        expectTypedefs(T6, 'X Function(Y, [Map<Y, Y>])', ['out X', 'in Y']);
+        expectTypedefs(T7, 'X Function(Y, [Map<Y, Y>])', ['out X extends String', 'in Y extends List<X>']);
       });
     }, skip: (!_generalizedTypedefsAllowed.allows(_platformVersion)));
   });

testing/test_package_experiments/lib/generalized_typedefs.dart

@@ -6,6 +6,8 @@
 /// typedef syntax, and produce correct results.
 library generalized_typedefs;
 
+// from basic_syntax_test (Dart SDK)
+
 typedef T0 = void;
 typedef T1 = Function;
 typedef T2<X> = List<X>;
@@ -15,8 +17,26 @@ typedef T5<X> = X Function(X, {X name});
 typedef T6<X, Y> = X Function(Y, [Map<Y, Y>]);
 typedef T7<X extends String, Y extends List<X>> = X Function(Y, [Map<Y, Y>]);
 
-void main() {
-  // ignore:unused_local_variable
-  var ensure_usage = [T0, T1, T2, T3, T4, T5, T6, T7];
-  print('hi');
+class C1<T3> {}
+
+typedef T8 = C1;
+
+abstract class C extends T8 {
+  T0 f;
+  T1 g(T2 a, T3 b);
+
+  T2 operator +(T2 other) => other;
+
+  static final T4 h = (){};
+  static T5<C>? i;
+
+  T7<String, List<String>> get j;
+
+  set k(T6<int, bool> value);
 }
+
+extension E on T6 {
+  static T4 f = () {};
+
+  T2 myMethod() => [5];
+}

tool/grind.dart

@@ -226,10 +226,7 @@ void analyze() async {
       '--fatal-infos',
       '--options',
       'analysis_options_presubmit.yaml',
-      'bin',
-      'lib',
-      'test',
-      'tool',
+      '.'
     ],
   );
 }
@@ -241,22 +238,26 @@ void dartfmt() async {
     // Filter out test packages as they always have strange formatting.
     // Passing parameters to dartfmt for directories to search results in
     // filenames being stripped of the dirname so we have to filter here.
-    void addFileToFix(String fileName) {
+    void addFileToFix(String base, String fileName) {
       var pathComponents = path.split(fileName);
       if (pathComponents.isNotEmpty && pathComponents.first == 'testing') {
         return;
       }
-      filesToFix.add(fileName);
+      filesToFix.add(path.join(base, fileName));
     }
 
     log('Validating dartfmt with version ${Platform.version}');
-    await SubprocessLauncher('dartfmt').runStreamed(
-        sdkBin('dartfmt'),
-        [
-          '-n',
-          '.',
-        ],
-        perLine: addFileToFix);
+    // TODO(jcollins-g): return to global once dartfmt can handle generic
+    // type aliases
+    for (var subDirectory in ['bin', 'lib', 'test', 'tool', path.join('testing/test_package')]) {
+      await SubprocessLauncher('dartfmt').runStreamed(
+          sdkBin('dartfmt'),
+          [
+            '-n',
+            subDirectory,
+          ],
+          perLine: (n) => addFileToFix(subDirectory, n));
+    }
     if (filesToFix.isNotEmpty) {
       fail(
           'dartfmt found files needing reformatting. Use this command to reformat:\n'