Merge NNBD branch into master (#2886)

* Start the NNBD migration branch with additional github configuration and a basic "non-migration" of all libraries (#2739)

* Update analyzer version to 2.0.0

* grind build for analyzer 2

* First steps toward migrating

* Basic migration infrastruture for new NNBD branch

* use separate workflow file for nnbd branch, for clarity

* thinko

* Merge master into nnbd branch (#2747)

* Switch to using CompilationUnitElement.classes (#2743)

* Prepare dartdoc_options for migration (#2745)

* more specific imports in options

* do not allow autoinitialization

* dartfmt

* parameterize the valueWithContext type

* Use alternative constructors instead of externalizing, didn't realize the autodetect was so widely used

* more subclasses

* Empty commit to straighten out GitHub Actions

* Convert options/logging libraries to null safety (#2748)

* Update analyzer version to 2.0.0

* grind build for analyzer 2

* First steps toward migrating

* Start migrating some things around the edges and see what happens

* Basic migration infrastruture for new NNBD branch

* use separate workflow file for nnbd branch, for clarity

* thinko

* Switch to using CompilationUnitElement.classes (#2743)

* Ignore null safe import warnings for presubmits

* Prepare dartdoc_options for migration (#2745)

* more specific imports in options

* do not allow autoinitialization

* dartfmt

* parameterize the valueWithContext type

* Use alternative constructors instead of externalizing, didn't realize the autodetect was so widely used

* more subclasses

* Empty commit to straighten out GitHub Actions

* dartfmt

* update NNBD branch from head (#2758)

* Switch to using CompilationUnitElement.classes (#2743)

* Prepare dartdoc_options for migration (#2745)

* more specific imports in options

* do not allow autoinitialization

* dartfmt

* parameterize the valueWithContext type

* Use alternative constructors instead of externalizing, didn't realize the autodetect was so widely used

* more subclasses

* Disable the unstable template checks and prepare for 2.14 stable. (#2752)

* Disable one of the template checks?  and add beta branch for testing

* beta is the new stable

* empty commit - force check reset

* Add a blurb to the README about requiring analysis (#2753)

* Allow comment references on generic typedefs (#2756)

Co-authored-by: Janice Collins <[email protected]>

* Prepare for dartdoc 2.0.0 (#2754)

* Prepare for dartdoc 2.0.0

* Update changelog for additional bugfix

Co-authored-by: Simon Binder <[email protected]>

* Migrate dartdoc_options.dart (#2749)

* Switch to using CompilationUnitElement.classes (#2743)

* Prepare dartdoc_options for migration (#2745)

* more specific imports in options

* do not allow autoinitialization

* dartfmt

* parameterize the valueWithContext type

* Use alternative constructors instead of externalizing, didn't realize the autodetect was so widely used

* more subclasses

* flatten

* Disable the unstable template checks and prepare for 2.14 stable. (#2752)

* Disable one of the template checks?  and add beta branch for testing

* beta is the new stable

* empty commit - force check reset

* Add a blurb to the README about requiring analysis (#2753)

* Allow comment references on generic typedefs (#2756)

Co-authored-by: Janice Collins <[email protected]>

* Prepare for dartdoc 2.0.0 (#2754)

* Prepare for dartdoc 2.0.0

* Update changelog for additional bugfix

* review comments

Co-authored-by: Simon Binder <[email protected]>

* Migrate package_meta, io_utils, and utils. (#2760)

* flatten

* Review comments

* opt-out for inheriting container

* A few more libraries migrated

* Migrate warnings.dart (#2787)

* Migrate mustachio to null safety (#2801)

* Migrate various util and small libraries (#2805)

* Migrate tool_runner to NNBD (#2804)

* Migrate tool runner

* dartfmt

* getAs -> getValueAs

* comment

* Migrate the renderers to NNBD (#2816)

* Migrate renderers

* dartfmt

* Migrate most mustachio tests to null safety (#2810)

* Merge main branch to NNBD (#2826)

* Refactor more documentation comment generation into DocumentationComment (#2817)

* Straight move

* Partial

* delete experiment

* rebuild

* remove ??= from a cut and paste

* Continuing the crushing down of documentation handling (#2818)

* Straight move

* Partial

* delete experiment

* rebuild

* moved computeDocumentationComment and documentationComment

* Move more documentation comment handling

* remove ??= from a cut and paste

* Documentation comment move for combos

* better as a getter

* Remove all deprecated bits in preparation for next release (#2821)

* Remove all deprecated bits in preparation for next release

* make some things final

* documentationComment can now be non-nullable (#2819)

* Straight move

* Partial

* delete experiment

* rebuild

* moved computeDocumentationComment and documentationComment

* Move more documentation comment handling

* remove ??= from a cut and paste

* Documentation comment move for combos

* better as a getter

* Untangle synthetic combo documentation in preparing for non-null

* rebuild

* documentationComment can be made non-nullable

* Update test.yaml to delete sdk check from beta branch

* tab conversion error

* correct name

* Stop testing beta in the bots (#2824)

* disable beta

* try switching on stable

* stable doesn't work for a lot of things now either :-(

* try enabling the main bot

* Change "dartfmt" -> "dart format". (#2822)

Co-authored-by: Janice Collins <[email protected]>

Co-authored-by: Bob Nystrom <[email protected]>

* Migrate more libraries to NNBD (#2827)

* migrate category

* Migrate model_comment_reference and the parser

* Fix test failure

* Migrate comment_referable and model_object_builder (#2832)

* squash

* fix error in filter setup

* fix test

* Migrate element_type to nnbd (#2834)

* Migrate markdown_processor and matching_link_result to NNBD (#2835)

* Migrate element_type to nnbd

* Migrate markdown_processor and matching_link_result

* Migrate most of lib/src/generators to nnbd (#2837)

* squash

* empty commit - reset actions

* Migrate most of the non-ModelElement bits of lib (#2838)

* squash

* rebuild

* Fixup hints

* Migrate most of what's left in tools/ (#2840)

* squash

* rebuild

* migrate more things

* subprocess

* type adjustment in grinder

* comments

* Canonicalize default input dir

* Revert "Canonicalize default input dir"

This reverts commit 5d76a51.

* Just disable the test, something odd is going on with MemoryResourceProvider.

* Migrate ModelElement and subclasses to NNBD (#2843)

* squash

* rebuild

* migrate more things

* subprocess

* type adjustment in grinder

* partial

* partial 2

* no errors, ship it

* clean up a lot of warnings

* All warnings done so really ship it

* dartfmt

* close

* manual changes on renderers

* comments

* partial

* fix some errors post-migration

* holy cow it passes the tests now

* make mustache happier and clean up an interface

* forgot to remove a fixme

* Work around strange super-not-allowed error in stable

* review comments

* Migrate runtime renderer to NNBD (#2849)

* squash from chain merges

* Things seem to work now, if not completely cleanly.

* Get runtime_renderer_render_test ready for NNBD strong mode, fix a few more problems

* deconfuse github

* add todo

* Update nnbd branch for latest changes and new resources-dir option (#2867)

* Stop using JavaFile. (#2856)

* Add a resources-dir option (#2857)

* Skip sdk-analyzer job (#2863)

* Use 'index' to access the enum value index. (#2865)

Co-authored-by: Sam Rawlins <[email protected]>

* Re-enable sdk-analyzer job, but make it not failing (#2864)

* Update new resources-dir option for null safety

* Fix html generator test merge

Co-authored-by: Konstantin Scheglov <[email protected]>
Co-authored-by: Sam Rawlins <[email protected]>

* Utilize new Object.hash function instead of quiver code (#2868)

* Minor cleanup to lints and some top level files (#2872)

* Cleanup categorization to simplify template generation migration (#2875)

* Cleanup model_element migration and surrounding accesses (#2876)

* Migrate the generated AOT renderers to null safety (#2874)

* Cleanup package_graph migration (#2869)

* Migrate several test files to null safety (#2871)

* Migrate comment_referable tests (#2877)

* Migrate tool/grind.dart to null safety (#2870)

* Migrate more tests; correct other migration bits (#2880)

* Correct some bad mustachio migration; migrate mustachio tests (#2879)

* Migrate the testing/ packages (#2881)

* Migrate most end2end tests; null safety tweaks (#2882)

* Make a few more nullable fields late final (#2883)

* Migrate model_test, the last file, to null safety (#2884)

* Merge master branch into nnbd branch (#2885)

* Stop using JavaFile. (#2856)

* Add a resources-dir option (#2857)

* Skip sdk-analyzer job (#2863)

* Use 'index' to access the enum value index. (#2865)

Co-authored-by: Sam Rawlins <[email protected]>

* Re-enable sdk-analyzer job, but make it not failing (#2864)

Co-authored-by: Konstantin Scheglov <[email protected]>

Co-authored-by: Janice Collins <[email protected]>
Co-authored-by: Simon Binder <[email protected]>
Co-authored-by: Bob Nystrom <[email protected]>
Co-authored-by: Parker Lougheed <[email protected]>
Co-authored-by: Konstantin Scheglov <[email protected]>

Author: 6 people

.github/workflows/nnbd-test.yaml

@@ -0,0 +1,70 @@
+name: Test
+
+on:
+  # Run CI on pushes to the main branch, and on PRs against main.
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  schedule:
+    - cron: 0 15 * * *
+
+env:
+  PUB_ENVIRONMENT: bot.github
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        sdk: [dev, stable]
+        job: [main, flutter, sdk-analyzer, packages, sdk-docs]
+        include:
+          - os: macos-latest
+            sdk: dev
+            job: main
+          - os: windows-latest
+            sdk: dev
+            job: main
+        exclude:
+            # Do not try to run flutter against the "stable" sdk,
+            # it is unlikely to work and produces uninteresting
+            # results.
+          - sdk: stable
+            job: flutter
+          - sdk: stable
+            job: sdk-analyzer
+
+    steps:
+      - name: Configure git
+        if: runner.os == 'Windows'
+        run: git config --global core.autocrlf input
+      - uses: actions/checkout@v2
+      - uses: dart-lang/[email protected]
+        with:
+          sdk: ${{ matrix.sdk }}
+      - name: Install dependencies
+        run: dart pub get
+      - name: ${{ matrix.job }}
+        if: runner.os != 'Windows'
+        run: ./tool/travis.sh
+        env:
+          DARTDOC_BOT: ${{ matrix.job }}
+          #COVERAGE_TOKEN: true # this needs to be set to enable coverage
+      - name: ${{ matrix.job }}
+        if: runner.os == 'Windows' && matrix.job == 'main'
+        run: dart run grinder buildbot
+        env:
+          DARTDOC_BOT: ${{ matrix.job }}
+     # - id: coverage
+     #   name: Upload coverage
+     #   if: runner.os == 'Linux' && matrix.job == 'main' && matrix.sdk == 'dev'
+     #   uses: coverallsapp/[email protected]
+     #   with:
+     #     github-token: ${{ secrets.GITHUB_TOKEN }}
+     #     path-to-lcov: lcov.info
+     # - name: Echo coveralls api result
+     #   if: runner.os == 'Linux' && matrix.job == 'main' && matrix.sdk == 'dev'
+     #   run: echo ${{ steps.coverage.outputs['coveralls-api-result'] }}

.github/workflows/test.yaml

@@ -1,11 +1,11 @@
-name: Test
+name: Test - NNBD branch
 
 on:
   # Run CI on pushes to the main branch, and on PRs against main.
   push:
-    branches: [ master ]
+    branches: [ nnbd ]
   pull_request:
-    branches: [ master ]
+    branches: [ nnbd ]
   schedule:
     - cron: 0 15 * * *
 
@@ -20,14 +20,14 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         sdk: [dev, stable]
-        job: [main, flutter, sdk-analyzer, packages, sdk-docs]
+        job: [nnbd, flutter, sdk-analyzer, packages, sdk-docs]
         include:
           - os: macos-latest
             sdk: dev
-            job: main
+            job: nnbd
           - os: windows-latest
             sdk: dev
-            job: main
+            job: nnbd
         exclude:
             # Do not try to run flutter against the "stable" sdk,
             # it is unlikely to work and produces uninteresting
@@ -76,8 +76,8 @@ jobs:
           DARTDOC_BOT: ${{ matrix.job }}
           #COVERAGE_TOKEN: true # this needs to be set to enable coverage
       - name: ${{ matrix.job }}
-        if: runner.os == 'Windows' && matrix.job == 'main'
-        run: dart run grinder buildbot
+        if: runner.os == 'Windows' && matrix.job == 'nnbd'
+        run: dart run grinder buildbot-no-publish
         env:
           DARTDOC_BOT: ${{ matrix.job }}
      # - id: coverage

analysis_options.yaml

@@ -14,12 +14,27 @@ analyzer:
     - 'lib/src/third_party/pkg/**'
     - 'lib/templates/*.html'
     - 'pub.dartlang.org/**'
-    - 'testing/**'
+    # These have a lot of lint.
+    - 'testing/test_package/**'
+    - 'testing/test_package_custom_templates/**'
+    - 'testing/test_package_experiments/**'
+    - 'testing/test_package_export_error/**'
+    - 'testing/test_package_extensions/**'
+    - 'testing/test_package_import_export_error/**'
+    - 'testing/test_package_imported/**'
+    - 'testing/test_package_options/**'
+    # This package imports flutter, which is perhaps not found by the base `dart analyze` tool.
     - 'testing/flutter_packages/test_package_flutter_plugin/**'
+    # This package is meant to mock the sky_engine package.
+    - 'testing/sky_engine/**'
+    # These packages have compile-time errors.
+    - 'testing/test_package_bad/**'
     - 'testing/test_package_export_error/**'
 linter:
   rules:
     always_declare_return_types: true
+    always_put_required_named_parameters_first: true
+    avoid_bool_literals_in_conditional_expressions: true
     avoid_dynamic_calls: true
     avoid_single_cascade_in_expression_statements: true
     avoid_unused_constructor_parameters: true
@@ -29,8 +44,10 @@ linter:
     package_api_docs: true
     prefer_final_fields: true
     prefer_initializing_formals: true
+    prefer_single_quotes: true
     prefer_void_to_null: true
     slash_for_doc_comments: true
     type_annotate_public_apis: true
     # Work in progress canonical score lints
     unawaited_futures: true
+    unnecessary_null_aware_assignments: true

analysis_options_presubmit.yaml

@@ -10,19 +10,35 @@ analyzer:
     ### Extra ignores for presubmit
     deprecated_member_use: ignore
     deprecated_member_use_from_same_package: ignore
+    ### Temporary presubmit ignore for NNBD migration
+    import_of_legacy_library_into_null_safe: ignore
   language:
     strict-raw-types: true
   exclude:
     - 'doc/**'
     - 'lib/src/third_party/pkg/**'
     - 'lib/templates/*.html'
     - 'pub.dartlang.org/**'
-    - 'testing/**'
-    - 'testing/flutter_packages/test_package_flutter_plugin/**'
+    # These have a lot of lint.
+    - 'testing/test_package/**'
+    - 'testing/test_package_custom_templates/**'
+    - 'testing/test_package_experiments/**'
     - 'testing/test_package_export_error/**'
+    - 'testing/test_package_extensions/**'
+    - 'testing/test_package_import_export_error/**'
+    - 'testing/test_package_imported/**'
+    - 'testing/test_package_options/**'
+    # This package imports flutter, which is perhaps not found by the base `dart analyze` tool.
+    - 'testing/flutter_packages/test_package_flutter_plugin/**'
+    # This package is meant to mock the sky_engine package.
+    - 'testing/sky_engine/**'
+    # These packages have compile-time errors.
+    - 'testing/test_package_bad/**'
 linter:
   rules:
     always_declare_return_types: true
+    always_put_required_named_parameters_first: true
+    avoid_bool_literals_in_conditional_expressions: true
     avoid_dynamic_calls: true
     avoid_single_cascade_in_expression_statements: true
     avoid_unused_constructor_parameters: true
@@ -32,8 +48,10 @@ linter:
     package_api_docs: true
     prefer_final_fields: true
     prefer_initializing_formals: true
+    prefer_single_quotes: true
     prefer_void_to_null: true
     slash_for_doc_comments: true
     type_annotate_public_apis: true
     # Work in progress canonical score lints
     unawaited_futures: true
+    unnecessary_null_aware_assignments: true