From 7f53cdbbce667acae27345fb825fd70aad3f999d Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Tue, 11 Jul 2023 08:06:21 -0600 Subject: [PATCH 01/27] test cases for dart3 support --- Makefile | 3 + pubspec.lock | 170 ++++++++++++------ snapshots/input/dart3-features/.tool-versions | 1 + snapshots/input/dart3-features/lib/main.dart | 60 +++++++ snapshots/input/dart3-features/pubspec.lock | 5 + snapshots/input/dart3-features/pubspec.yaml | 5 + snapshots/output/basic-project/lib/main.dart | 14 +- snapshots/output/basic-project/lib/more.dart | 40 ++--- snapshots/output/basic-project/lib/other.dart | 8 +- snapshots/output/dart3-features/lib/main.dart | 156 ++++++++++++++++ 10 files changed, 374 insertions(+), 88 deletions(-) create mode 100644 snapshots/input/dart3-features/.tool-versions create mode 100644 snapshots/input/dart3-features/lib/main.dart create mode 100644 snapshots/input/dart3-features/pubspec.lock create mode 100644 snapshots/input/dart3-features/pubspec.yaml create mode 100755 snapshots/output/dart3-features/lib/main.dart diff --git a/Makefile b/Makefile index 5ee2a9b6..d859a4c4 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,9 @@ regen-snapshots: dart run scip_dart ./snapshots/input/basic-project --verbose scip snapshot --to ./snapshots/output/basic-project + dart run scip_dart ./snapshots/input/dart3-features --verbose + scip snapshot --to ./snapshots/output/dart3-features + run: dart run scip_dart ./snapshots/input/staging-project --verbose diff --git a/pubspec.lock b/pubspec.lock index ca9fe15d..45861b5c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,393 +5,449 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: e440ac42679dfc04bbbefb58ed225c994bc7e07fccc8a68ec7d3631a127e5da9 + url: "https://pub.dev" source: hosted version: "54.0.0" analyzer: dependency: "direct main" description: name: analyzer - url: "https://pub.dartlang.org" + sha256: "2c2e3721ee9fb36de92faa060f3480c81b23e904352b087e5c64224b1a044427" + url: "https://pub.dev" source: hosted version: "5.6.0" args: dependency: "direct main" description: name: args - url: "https://pub.dartlang.org" + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" source: hosted version: "2.4.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted version: "2.1.1" build: dependency: transitive description: name: build - url: "https://pub.dartlang.org" + sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" + url: "https://pub.dev" source: hosted version: "2.3.1" build_config: dependency: transitive description: name: build_config - url: "https://pub.dartlang.org" + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" source: hosted version: "1.1.1" build_daemon: dependency: transitive description: name: build_daemon - url: "https://pub.dartlang.org" + sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169" + url: "https://pub.dev" source: hosted version: "3.1.1" build_resolvers: dependency: transitive description: name: build_resolvers - url: "https://pub.dartlang.org" + sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 + url: "https://pub.dev" source: hosted version: "2.2.0" build_runner: dependency: transitive description: name: build_runner - url: "https://pub.dartlang.org" + sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727 + url: "https://pub.dev" source: hosted version: "2.3.3" build_runner_core: dependency: transitive description: name: build_runner_core - url: "https://pub.dartlang.org" + sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292" + url: "https://pub.dev" source: hosted version: "7.2.7" built_collection: dependency: transitive description: name: built_collection - url: "https://pub.dartlang.org" + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" source: hosted version: "5.1.1" built_value: dependency: transitive description: name: built_value - url: "https://pub.dartlang.org" + sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" + url: "https://pub.dev" source: hosted version: "8.6.1" checked_yaml: dependency: transitive description: name: checked_yaml - url: "https://pub.dartlang.org" + sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311" + url: "https://pub.dev" source: hosted version: "2.0.2" code_builder: dependency: transitive description: name: code_builder - url: "https://pub.dartlang.org" + sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + url: "https://pub.dev" source: hosted version: "4.4.0" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + url: "https://pub.dev" source: hosted version: "1.17.2" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" source: hosted version: "3.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + url: "https://pub.dev" source: hosted version: "3.0.2" dart_dev: dependency: "direct dev" description: name: dart_dev - url: "https://pub.dartlang.org" + sha256: d9800c73a0260ff82dc8448d119a51721e6e88d67739ab60050e8123fbf81cc6 + url: "https://pub.dev" source: hosted version: "4.0.1" dart_style: dependency: transitive description: name: dart_style - url: "https://pub.dartlang.org" + sha256: "5be16bf1707658e4c03078d4a9b90208ded217fb02c163e207d334082412f2fb" + url: "https://pub.dev" source: hosted version: "2.2.5" dependency_validator: dependency: "direct dev" description: name: dependency_validator - url: "https://pub.dartlang.org" + sha256: "08349175533ed0bd06eb9b6043cde66c45b2bfc7ebc222a7542cdb1324f1bf03" + url: "https://pub.dev" source: hosted version: "3.2.2" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted version: "6.1.4" fixnum: dependency: transitive description: name: fixnum - url: "https://pub.dartlang.org" + sha256: "04be3e934c52e082558cc9ee21f42f5c1cd7a1262f4c63cd0357c08d5bba81ec" + url: "https://pub.dev" source: hosted version: "1.0.1" frontend_server_client: dependency: transitive description: name: frontend_server_client - url: "https://pub.dartlang.org" + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + url: "https://pub.dev" source: hosted version: "3.2.0" glob: dependency: "direct dev" description: name: glob - url: "https://pub.dartlang.org" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" source: hosted version: "2.1.2" graphs: dependency: transitive description: name: graphs - url: "https://pub.dartlang.org" + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + url: "https://pub.dev" source: hosted version: "2.3.1" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" source: hosted version: "3.2.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted version: "4.0.2" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" source: hosted version: "1.0.4" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" source: hosted version: "0.6.5" json_annotation: dependency: transitive description: name: json_annotation - url: "https://pub.dartlang.org" + sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + url: "https://pub.dev" source: hosted version: "4.8.0" logging: dependency: transitive description: name: logging - url: "https://pub.dartlang.org" + sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + url: "https://pub.dev" source: hosted version: "1.1.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" source: hosted version: "0.12.16" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" source: hosted version: "1.9.1" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" source: hosted version: "1.0.4" package_config: dependency: "direct main" description: name: package_config - url: "https://pub.dartlang.org" + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" source: hosted version: "2.1.0" path: dependency: "direct main" description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted version: "1.8.3" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" source: hosted version: "1.5.1" protobuf: dependency: "direct main" description: name: protobuf - url: "https://pub.dartlang.org" + sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08" + url: "https://pub.dev" source: hosted version: "2.1.0" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" source: hosted version: "2.1.4" pubspec_parse: dependency: "direct main" description: name: pubspec_parse - url: "https://pub.dartlang.org" + sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + url: "https://pub.dev" source: hosted version: "1.2.3" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" source: hosted version: "1.4.1" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + url: "https://pub.dev" source: hosted version: "1.0.4" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted version: "2.1.1" stream_transform: dependency: transitive description: name: stream_transform - url: "https://pub.dartlang.org" + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" source: hosted version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + url: "https://pub.dev" source: hosted version: "0.6.0" timing: dependency: transitive description: name: timing - url: "https://pub.dartlang.org" + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" source: hosted version: "1.0.1" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" source: hosted version: "1.3.2" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + url: "https://pub.dev" source: hosted version: "1.0.2" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + url: "https://pub.dev" source: hosted version: "2.4.0" workiva_analysis_options: dependency: "direct dev" description: name: workiva_analysis_options - url: "https://pub.dartlang.org" + sha256: "428e75a330786b519c87409530c52a1f366731af2cf94fe6da85582889d583bc" + url: "https://pub.dev" source: hosted version: "1.3.0" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + url: "https://pub.dev" source: hosted version: "3.1.1" sdks: - dart: ">=2.18.0 <3.0.0" + dart: ">=2.19.0 <4.0.0" diff --git a/snapshots/input/dart3-features/.tool-versions b/snapshots/input/dart3-features/.tool-versions new file mode 100644 index 00000000..b7a2d8be --- /dev/null +++ b/snapshots/input/dart3-features/.tool-versions @@ -0,0 +1 @@ +dart 3.0.5 diff --git a/snapshots/input/dart3-features/lib/main.dart b/snapshots/input/dart3-features/lib/main.dart new file mode 100644 index 00000000..8cad7a2f --- /dev/null +++ b/snapshots/input/dart3-features/lib/main.dart @@ -0,0 +1,60 @@ +(String, int) userInfo(Map json) { + return (json['name'] as String, json['height'] as int); +} + +void parser(int charCode) { + const slash = 1; + const star = 2; + const plus = 3; + const minus = 4; + + final nextCharCode = 'a'; + const digit0 = 0; + const digit9 = 9; + + void skipComment() {} + void operator(int charCode) {} + void number() {} + void invalid() {} + + switch (charCode) { + case slash when nextCharCode == slash: + skipComment(); + + case slash || star || plus || minus: + operator(charCode); + + case >= digit0 && <= digit9: + number(); + + default: + invalid(); + } +} + +const six = 6; +const msg = 'Feeling the Monday blues?'; +String describeDate(DateTime dt) { + const one = 1; + return switch (dt.weekday) { + one => 'Feeling the Monday blues?', + six || 7 => 'Enjoy the weekend!', + _ => 'Hang in there.' + }; +} + +void main() { + var (String name, int height) = userInfo({'name': 'Michael', 'height': 180}); + print('User $name is $height cm tall.'); + + + final json = {'name': 'Michael', 'height': 180}; + if (json case {'name': 'Michael', 'height': int h}) { + print('Michael is $h cm tall.'); + } +} + +base class Foo {} +final class Bar {} +interface class Car {} +sealed class Zar {} \ No newline at end of file diff --git a/snapshots/input/dart3-features/pubspec.lock b/snapshots/input/dart3-features/pubspec.lock new file mode 100644 index 00000000..573410f7 --- /dev/null +++ b/snapshots/input/dart3-features/pubspec.lock @@ -0,0 +1,5 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: {} +sdks: + dart: ">=3.0.0 <4.0.0" diff --git a/snapshots/input/dart3-features/pubspec.yaml b/snapshots/input/dart3-features/pubspec.yaml new file mode 100644 index 00000000..a61ac8bc --- /dev/null +++ b/snapshots/input/dart3-features/pubspec.yaml @@ -0,0 +1,5 @@ +name: dart3_features +version: 1.0.0 + +environment: + sdk: ">=3.0.0 <4.0.0" \ No newline at end of file diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index b20c0acd..8b5804b9 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -6,11 +6,11 @@ /// Takes a number /// Returns a number int fib(int n) { -//^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# +//^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // documentation ```dart // documentation This is a fib function -// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart if (n <= 1) return 0; @@ -25,11 +25,11 @@ void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // documentation ```dart -// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart print(fib(a)); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 1 } @@ -38,7 +38,7 @@ // ^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/y. // documentation ```dart String capture() { -//^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# +//^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart return y; @@ -63,7 +63,7 @@ // ^ definition local 3 // documentation ```dart print(i); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). // ^ reference local 3 } @@ -99,7 +99,7 @@ // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/someFunction(). // documentation ```dart // documentation Reference parameter: [value] -// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^^ definition local 5 // documentation ```dart Foo(1); diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index 94af943f..4dba05cd 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -28,7 +28,7 @@ // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). // documentation ```dart print('zzz...'); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). } } @@ -37,7 +37,7 @@ // documentation ```dart // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# String name; -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart AnimalType type; @@ -66,26 +66,26 @@ // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. soundMaker = () => print('Meow!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). break; case AnimalType.dog: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. soundMaker = () => print('Woof!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). break; case AnimalType.bird: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. soundMaker = () => print('Chirp!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). break; default: soundMaker = () => print('Unknown animal type'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). } } @@ -97,9 +97,9 @@ } @override -// ^^^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/annotations.dart/override. +// ^^^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/annotations.dart/override. String toString() { -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart return '$name the $type'; @@ -109,16 +109,16 @@ } int calculateSum(List numbers) { -//^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# +//^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart -// ^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/list.dart/List# -// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# +// ^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/list.dart/List# +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart return numbers.reduce((value, element) => value + element); // ^^^^^^^ reference local 1 -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/iterable.dart/Iterable#reduce(). +// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/iterable.dart/Iterable#reduce(). // ^^^^^ definition local 2 // documentation ```dart // ^^^^^^^ definition local 3 @@ -131,12 +131,12 @@ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart List numbers = [1, 2, 3, 4, 5]; -// ^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/list.dart/List# -// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# +// ^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/list.dart/List# +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart int sum = calculateSum(numbers); -// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^ definition local 5 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). @@ -174,19 +174,19 @@ // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). print(cat); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). // ^^^ reference local 6 print(dog); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). // ^^^ reference local 7 print('The sum of $numbers is $sum'); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). // ^^^^^^^ reference local 4 // ^^^ reference local 5 print(math.Rectangle(1,2,3,4)); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/math. -// ^^^^^^^^^ reference scip-dart pub dart:math 2.18.0 dart:math/rectangle.dart/Rectangle# +// ^^^^^^^^^ reference scip-dart pub dart:math 3.0.0 dart:math/rectangle.dart/Rectangle# } diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index d8eadfed..ea282117 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -7,7 +7,7 @@ // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // documentation ```dart int _far; -// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart Foo(this._far); @@ -23,7 +23,7 @@ // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // documentation ```dart String _someValue; -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# // ^^^^^^^^^^ definition local 2 // documentation ```dart Bar(this._someValue); @@ -40,7 +40,7 @@ _someValue = 'asdf'; // ^^^^^^^^^^ reference local 2 print(_someValue); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). // ^^^^^^^^^^ reference local 2 } } @@ -50,7 +50,7 @@ // documentation ```dart more.loadLibrary().then((_) => { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/more. -// ^^^^ reference scip-dart pub dart:async 2.18.0 dart:async/future.dart/Future#then(). +// ^^^^ reference scip-dart pub dart:async 3.0.0 dart:async/future.dart/Future#then(). // ^ definition local 4 // documentation ```dart Bar('a').someMethod.call() diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart new file mode 100755 index 00000000..7c1f20f7 --- /dev/null +++ b/snapshots/output/dart3-features/lib/main.dart @@ -0,0 +1,156 @@ + (String, int) userInfo(Map json) { +// definition scip-dart pub dart3_features 1.0.0 lib/main.dart/ +// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# +// ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). +// documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/map.dart/Map# +// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# +// ^^^^ definition local 0 +// documentation ```dart + return (json['name'] as String, json['height'] as int); +// ^^^^ reference local 0 +// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# +// ^^^^ reference local 0 +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# + } + + void parser(int charCode) { +// ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/parser(). +// documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# +// ^^^^^^^^ definition local 1 +// documentation ```dart + const slash = 1; +// ^^^^^ definition local 2 +// documentation ```dart + const star = 2; +// ^^^^ definition local 3 +// documentation ```dart + const plus = 3; +// ^^^^ definition local 4 +// documentation ```dart + const minus = 4; +// ^^^^^ definition local 5 +// documentation ```dart + + final nextCharCode = 'a'; +// ^^^^^^^^^^^^ definition local 6 +// documentation ```dart + const digit0 = 0; +// ^^^^^^ definition local 7 +// documentation ```dart + const digit9 = 9; +// ^^^^^^ definition local 8 +// documentation ```dart + + void skipComment() {} +// ^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). +// documentation ```dart + void operator(int charCode) {} +// ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operator(). +// documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# +// ^^^^^^^^ definition local 9 +// documentation ```dart + void number() {} +// ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). +// documentation ```dart + void invalid() {} +// ^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). +// documentation ```dart + + switch (charCode) { +// ^^^^^^^^ reference local 1 + case slash when nextCharCode == slash: +// ^^^^^ reference local 2 + skipComment(); +// ^^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). + + case slash || star || plus || minus: +// ^^^^^ reference local 2 +// ^^^^ reference local 3 +// ^^^^ reference local 4 +// ^^^^^ reference local 5 + operator(charCode); +// ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/operator(). +// ^^^^^^^^ reference local 1 + + case >= digit0 && <= digit9: +// ^^^^^^ reference local 7 +// ^^^^^^ reference local 8 + number(); +// ^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). + + default: + invalid(); +// ^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). + } + } + + const six = 6; +// ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/six. +// documentation ```dart + const msg = 'Feeling the Monday blues?'; +// ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/msg. +// documentation ```dart + String describeDate(DateTime dt) { +//^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# +// ^^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/describeDate(). +// documentation ```dart +// ^^^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/date_time.dart/DateTime# +// ^^ definition local 10 +// documentation ```dart + const one = 1; +// ^^^ definition local 11 +// documentation ```dart + return switch (dt.weekday) { +// ^^ reference local 10 +// ^^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/date_time.dart/DateTime#weekday. + one => 'Feeling the Monday blues?', + six || 7 => 'Enjoy the weekend!', + _ => 'Hang in there.' + }; + } + + void main() { +// ^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/main(). +// documentation ```dart + var (String name, int height) = userInfo({'name': 'Michael', 'height': 180}); +// definition local 12 +// documentation ```dart +// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# +// ^^^^ definition local 13 +// documentation ```dart +// ^^^ definition local 14 +// documentation ```dart +// reference local 12 +// reference local 12 +// ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). + print('User $name is $height cm tall.'); +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^ reference local 13 + + + final json = {'name': 'Michael', 'height': 180}; +// ^^^^ definition local 15 +// documentation ```dart + if (json case {'name': 'Michael', 'height': int h}) { +// ^^^^ reference local 15 + print('Michael is $h cm tall.'); +// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). + } + } + + base class Foo {} +// ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Foo# +// documentation ```dart + final class Bar {} +// ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Bar# +// documentation ```dart + interface class Car {} +// ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Car# +// documentation ```dart + sealed class Zar {} +// ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Zar# +// documentation ```dart From 001432bdc49e9b07ce19595be1dd854e1e99fc89 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Tue, 11 Jul 2023 08:28:16 -0600 Subject: [PATCH 02/27] minor deps --- .github/workflows/checks.yaml | 4 +- pubspec.lock | 226 ++-------------------------------- pubspec.yaml | 5 +- tool/dart_dev/config.dart | 11 -- 4 files changed, 13 insertions(+), 233 deletions(-) delete mode 100644 tool/dart_dev/config.dart diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 1e3ad6f6..2e9d2d52 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -12,7 +12,7 @@ jobs: with: sdk: 2.18.7 - run: dart pub get - - run: dart run dart_dev analyze + - run: dart analyze format: runs-on: ubuntu-latest @@ -22,7 +22,7 @@ jobs: with: sdk: 2.18.7 - run: dart pub get - - run: dart run dart_dev format --check + - run: dart format --set-exit-if-changed . dependency-validator: runs-on: ubuntu-latest diff --git a/pubspec.lock b/pubspec.lock index 45861b5c..278f489b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: e440ac42679dfc04bbbefb58ed225c994bc7e07fccc8a68ec7d3631a127e5da9 + sha256: "0816708f5fbcacca324d811297153fe3c8e047beb5c6752e12292d2974c17045" url: "https://pub.dev" source: hosted - version: "54.0.0" + version: "62.0.0" analyzer: dependency: "direct main" description: name: analyzer - sha256: "2c2e3721ee9fb36de92faa060f3480c81b23e904352b087e5c64224b1a044427" + sha256: "21862995c9932cd082f89d72ae5f5e2c110d1a0204ad06e4ebaee8307b76b834" url: "https://pub.dev" source: hosted - version: "5.6.0" + version: "6.0.0" args: dependency: "direct main" description: @@ -33,22 +33,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.11.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - build: - dependency: transitive - description: - name: build - sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" - url: "https://pub.dev" - source: hosted - version: "2.3.1" build_config: dependency: transitive description: @@ -57,54 +41,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" - build_daemon: - dependency: transitive - description: - name: build_daemon - sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169" - url: "https://pub.dev" - source: hosted - version: "3.1.1" - build_resolvers: - dependency: transitive - description: - name: build_resolvers - sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 - url: "https://pub.dev" - source: hosted - version: "2.2.0" - build_runner: - dependency: transitive - description: - name: build_runner - sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727 - url: "https://pub.dev" - source: hosted - version: "2.3.3" - build_runner_core: - dependency: transitive - description: - name: build_runner_core - sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292" - url: "https://pub.dev" - source: hosted - version: "7.2.7" - built_collection: - dependency: transitive - description: - name: built_collection - sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" - url: "https://pub.dev" - source: hosted - version: "5.1.1" - built_value: - dependency: transitive - description: - name: built_value - sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" - url: "https://pub.dev" - source: hosted - version: "8.6.1" checked_yaml: dependency: transitive description: @@ -113,14 +49,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.2" - code_builder: - dependency: transitive - description: - name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" - url: "https://pub.dev" - source: hosted - version: "4.4.0" collection: dependency: transitive description: @@ -145,22 +73,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" - dart_dev: - dependency: "direct dev" - description: - name: dart_dev - sha256: d9800c73a0260ff82dc8448d119a51721e6e88d67739ab60050e8123fbf81cc6 - url: "https://pub.dev" - source: hosted - version: "4.0.1" - dart_style: + dart_internal: dependency: transitive description: - name: dart_style - sha256: "5be16bf1707658e4c03078d4a9b90208ded217fb02c163e207d334082412f2fb" + name: dart_internal + sha256: dae3976f383beddcfcd07ad5291a422df2c8c0a8a03c52cda63ac7b4f26e0f4e url: "https://pub.dev" source: hosted - version: "2.2.5" + version: "0.2.8" dependency_validator: dependency: "direct dev" description: @@ -185,14 +105,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" - frontend_server_client: - dependency: transitive - description: - name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" - url: "https://pub.dev" - source: hosted - version: "3.2.0" glob: dependency: "direct dev" description: @@ -201,30 +113,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.2" - graphs: - dependency: transitive - description: - name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 - url: "https://pub.dev" - source: hosted - version: "2.3.1" - http_multi_server: - dependency: transitive - description: - name: http_multi_server - sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" - url: "https://pub.dev" - source: hosted - version: "3.2.1" - http_parser: - dependency: transitive - description: - name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" - url: "https://pub.dev" - source: hosted - version: "4.0.2" io: dependency: transitive description: @@ -233,14 +121,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" json_annotation: dependency: transitive description: @@ -257,14 +137,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" - matcher: - dependency: transitive - description: - name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" - url: "https://pub.dev" - source: hosted - version: "0.12.16" meta: dependency: transitive description: @@ -273,14 +145,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.1" - mime: - dependency: transitive - description: - name: mime - sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e - url: "https://pub.dev" - source: hosted - version: "1.0.4" package_config: dependency: "direct main" description: @@ -297,14 +161,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.8.3" - pool: - dependency: transitive - description: - name: pool - sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" - url: "https://pub.dev" - source: hosted - version: "1.5.1" protobuf: dependency: "direct main" description: @@ -329,22 +185,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.3" - shelf: - dependency: transitive - description: - name: shelf - sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 - url: "https://pub.dev" - source: hosted - version: "1.4.1" - shelf_web_socket: - dependency: transitive - description: - name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" - url: "https://pub.dev" - source: hosted - version: "1.0.4" source_span: dependency: transitive description: @@ -353,30 +193,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - stream_transform: - dependency: transitive - description: - name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" - url: "https://pub.dev" - source: hosted - version: "2.1.0" string_scanner: dependency: transitive description: @@ -393,22 +209,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" - url: "https://pub.dev" - source: hosted - version: "0.6.0" - timing: - dependency: transitive - description: - name: timing - sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" - url: "https://pub.dev" - source: hosted - version: "1.0.1" typed_data: dependency: transitive description: @@ -425,14 +225,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.2" - web_socket_channel: - dependency: transitive - description: - name: web_socket_channel - sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b - url: "https://pub.dev" - source: hosted - version: "2.4.0" workiva_analysis_options: dependency: "direct dev" description: @@ -450,4 +242,4 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.19.0 <4.0.0" + dart: ">=3.0.0 <3.2.0" diff --git a/pubspec.yaml b/pubspec.yaml index 67b1c2a8..9fff70d8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,13 +4,13 @@ description: generates scip bindings for dart files repository: https://github.com/Workiva/scip-dart environment: - sdk: ">=2.18.0 <3.0.0" + sdk: ">=3.0.0 <4.0.0" executables: scip_dart: dependencies: - analyzer: ^5.4.0 + analyzer: ^6.0.0 args: ^2.4.0 package_config: ^2.1.0 path: ^1.8.3 @@ -18,7 +18,6 @@ dependencies: pubspec_parse: ^1.2.1 dev_dependencies: - dart_dev: ">=3.9.2 <5.0.0" dependency_validator: ^3.2.2 glob: ^2.1.1 workiva_analysis_options: ^1.0.0 \ No newline at end of file diff --git a/tool/dart_dev/config.dart b/tool/dart_dev/config.dart deleted file mode 100644 index ffe7397c..00000000 --- a/tool/dart_dev/config.dart +++ /dev/null @@ -1,11 +0,0 @@ -import 'package:dart_dev/dart_dev.dart'; -import 'package:glob/glob.dart'; - -final config = { - ...coreConfig, - 'format': FormatTool() - ..exclude = [ - Glob('snapshots/**'), - Glob('lib/src/gen/*.dart'), - ], -}; From b94a3755f625c2fdd273507911bfb8248b70ecd6 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Tue, 11 Jul 2023 08:32:42 -0600 Subject: [PATCH 03/27] updates --- snapshots/input/dart3-features/lib/main.dart | 7 +++- snapshots/output/basic-project/lib/main.dart | 6 --- snapshots/output/basic-project/lib/more.dart | 17 -------- snapshots/output/basic-project/lib/other.dart | 3 -- snapshots/output/dart3-features/lib/main.dart | 40 +++++++------------ 5 files changed, 20 insertions(+), 53 deletions(-) diff --git a/snapshots/input/dart3-features/lib/main.dart b/snapshots/input/dart3-features/lib/main.dart index 8cad7a2f..cd779548 100644 --- a/snapshots/input/dart3-features/lib/main.dart +++ b/snapshots/input/dart3-features/lib/main.dart @@ -38,13 +38,16 @@ String describeDate(DateTime dt) { const one = 1; return switch (dt.weekday) { one => 'Feeling the Monday blues?', - six || 7 => 'Enjoy the weekend!', + 7 || six => 'Enjoy the weekend!', _ => 'Hang in there.' }; } void main() { - var (String name, int height) = userInfo({'name': 'Michael', 'height': 180}); + var ( + String name, + int height, + ) = userInfo({'name': 'Michael', 'height': 180}); print('User $name is $height cm tall.'); diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 8b5804b9..56863141 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -6,11 +6,9 @@ /// Takes a number /// Returns a number int fib(int n) { -//^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // documentation ```dart // documentation This is a fib function -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart if (n <= 1) return 0; @@ -25,7 +23,6 @@ void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // documentation ```dart -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart print(fib(a)); @@ -38,7 +35,6 @@ // ^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/y. // documentation ```dart String capture() { -//^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart return y; @@ -99,9 +95,7 @@ // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/someFunction(). // documentation ```dart // documentation Reference parameter: [value] -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^^ definition local 5 // documentation ```dart Foo(1); -// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# } diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index 4dba05cd..f067caa5 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -35,17 +35,13 @@ class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // documentation ```dart -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# String name; -// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart AnimalType type; -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // documentation ```dart SoundMaker? soundMaker; -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // documentation ```dart @@ -99,7 +95,6 @@ @override // ^^^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/annotations.dart/override. String toString() { -// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart return '$name the $type'; @@ -109,11 +104,8 @@ } int calculateSum(List numbers) { -//^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart -// ^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/list.dart/List# -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart return numbers.reduce((value, element) => value + element); @@ -131,30 +123,23 @@ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart List numbers = [1, 2, 3, 4, 5]; -// ^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/list.dart/List# -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart int sum = calculateSum(numbers); -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^ definition local 5 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // ^^^^^^^ reference local 4 Animal cat = Animal('Kitty', type: AnimalType.cat); -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 6 // documentation ```dart -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. Animal dog = Animal('Buddy', type: AnimalType.dog); -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 7 // documentation ```dart -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. @@ -186,7 +171,5 @@ print(math.Rectangle(1,2,3,4)); // ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). -// ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/math. -// ^^^^^^^^^ reference scip-dart pub dart:math 3.0.0 dart:math/rectangle.dart/Rectangle# } diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index ea282117..bdbe3924 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -7,7 +7,6 @@ // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // documentation ```dart int _far; -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart Foo(this._far); @@ -23,7 +22,6 @@ // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // documentation ```dart String _someValue; -// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# // ^^^^^^^^^^ definition local 2 // documentation ```dart Bar(this._someValue); @@ -54,7 +52,6 @@ // ^ definition local 4 // documentation ```dart Bar('a').someMethod.call() -// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). }); } diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index 7c1f20f7..250a2609 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -1,24 +1,17 @@ (String, int) userInfo(Map json) { // definition scip-dart pub dart3_features 1.0.0 lib/main.dart/ -// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). // documentation ```dart -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/map.dart/Map# -// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# // ^^^^ definition local 0 // documentation ```dart return (json['name'] as String, json['height'] as int); // ^^^^ reference local 0 -// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# // ^^^^ reference local 0 -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# } void parser(int charCode) { // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/parser(). // documentation ```dart -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 1 // documentation ```dart const slash = 1; @@ -50,7 +43,6 @@ void operator(int charCode) {} // ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operator(). // documentation ```dart -// ^^^ reference scip-dart pub dart:core 3.0.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 9 // documentation ```dart void number() {} @@ -64,6 +56,8 @@ // ^^^^^^^^ reference local 1 case slash when nextCharCode == slash: // ^^^^^ reference local 2 +// ^^^^^^^^^^^^ reference local 6 +// ^^^^^ reference local 2 skipComment(); // ^^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). @@ -95,10 +89,8 @@ // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/msg. // documentation ```dart String describeDate(DateTime dt) { -//^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# // ^^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/describeDate(). // documentation ```dart -// ^^^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/date_time.dart/DateTime# // ^^ definition local 10 // documentation ```dart const one = 1; @@ -108,7 +100,9 @@ // ^^ reference local 10 // ^^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/date_time.dart/DateTime#weekday. one => 'Feeling the Monday blues?', - six || 7 => 'Enjoy the weekend!', +// ^^^ reference local 11 + 7 || six => 'Enjoy the weekend!', +// ^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/six. _ => 'Hang in there.' }; } @@ -116,29 +110,25 @@ void main() { // ^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/main(). // documentation ```dart - var (String name, int height) = userInfo({'name': 'Michael', 'height': 180}); -// definition local 12 -// documentation ```dart -// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/string.dart/String# -// ^^^^ definition local 13 -// documentation ```dart -// ^^^ definition local 14 -// documentation ```dart -// reference local 12 -// reference local 12 -// ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). + var ( + String name, + int height, + ) = userInfo({'name': 'Michael', 'height': 180}); +// ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). print('User $name is $height cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). -// ^^^^ reference local 13 +// ^^^^ reference local 12 +// ^^^^^^ reference local 13 final json = {'name': 'Michael', 'height': 180}; -// ^^^^ definition local 15 +// ^^^^ definition local 14 // documentation ```dart if (json case {'name': 'Michael', 'height': int h}) { -// ^^^^ reference local 15 +// ^^^^ reference local 14 print('Michael is $h cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^ reference local 15 } } From bf7a7f278aef56919e81941ed0b7f8f0334f0f7b Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Fri, 1 Sep 2023 09:19:53 -0600 Subject: [PATCH 04/27] regen --- pubspec.lock | 36 +++++----- snapshots/output/basic-project/lib/main.dart | 4 +- snapshots/output/basic-project/lib/more.dart | 65 ++++++++++--------- snapshots/output/basic-project/lib/other.dart | 4 +- snapshots/output/dart3-features/lib/main.dart | 6 +- .../relationships-project/lib/main.dart | 13 +--- 6 files changed, 63 insertions(+), 65 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 7d4e25d7..b35fb170 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -45,18 +45,18 @@ packages: dependency: transitive description: name: checked_yaml - sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311" + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" collection: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" dependency_validator: dependency: "direct dev" description: @@ -85,18 +85,18 @@ packages: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.0" fixnum: dependency: transitive description: name: fixnum - sha256: "04be3e934c52e082558cc9ee21f42f5c1cd7a1262f4c63cd0357c08d5bba81ec" + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" glob: dependency: "direct dev" description: @@ -117,18 +117,18 @@ packages: dependency: transitive description: name: json_annotation - sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "4.8.1" logging: dependency: transitive description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" meta: dependency: transitive description: @@ -213,10 +213,10 @@ packages: dependency: transitive description: name: watcher - sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.1.0" workiva_analysis_options: dependency: "direct dev" description: @@ -229,9 +229,9 @@ packages: dependency: transitive description: name: yaml - sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" sdks: dart: ">=3.0.0 <4.0.0" diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 56863141..721fe671 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -26,7 +26,7 @@ // ^ definition local 1 // documentation ```dart print(fib(a)); -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 1 } @@ -59,7 +59,7 @@ // ^ definition local 3 // documentation ```dart print(i); -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 3 } diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index 96b061c9..f5a63dec 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -2,7 +2,7 @@ // definition scip-dart pub dart_test 1.0.0 lib/more.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/math. // documentation ```dart - + enum AnimalType { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // documentation ```dart @@ -16,11 +16,11 @@ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. // documentation ```dart } - + typedef SoundMaker = void Function(); // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // documentation ```dart - + mixin SleepMixin { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# // documentation ```dart @@ -28,10 +28,10 @@ // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). // documentation ```dart print('zzz...'); -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). } } - + class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // documentation ```dart @@ -44,7 +44,7 @@ SoundMaker? soundMaker; // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // documentation ```dart - + Animal(this.name, {required this.type}) { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#(). // documentation ```dart @@ -62,38 +62,38 @@ // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. soundMaker = () => print('Meow!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). break; case AnimalType.dog: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. soundMaker = () => print('Woof!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). break; case AnimalType.bird: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. soundMaker = () => print('Chirp!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). break; default: soundMaker = () => print('Unknown animal type'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). } } - + void makeSound() { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). // documentation ```dart soundMaker?.call(); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. } - + @override -// ^^^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/annotations.dart/override. +// ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String toString() { // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart @@ -102,7 +102,7 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. } } - + int calculateSum(List numbers) { // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart @@ -110,7 +110,7 @@ // documentation ```dart return numbers.reduce((value, element) => value + element); // ^^^^^^^ reference local 1 -// ^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/iterable.dart/Iterable#reduce(). +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^^^^^ definition local 2 // documentation ```dart // ^^^^^^^ definition local 3 @@ -118,7 +118,7 @@ // ^^^^^ reference local 2 // ^^^^^^^ reference local 3 } - + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart @@ -130,7 +130,7 @@ // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // ^^^^^^^ reference local 4 - + Animal cat = Animal('Kitty', type: AnimalType.cat); // ^^^ definition local 6 // documentation ```dart @@ -143,47 +143,52 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - + cat.makeSound(); // ^^^ reference local 6 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). cat.sleep(); // ^^^ reference local 6 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - + dog.makeSound(); // ^^^ reference local 7 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). dog.sleep(); // ^^^ reference local 7 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - + print(cat); -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 6 print(dog); -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 7 print('The sum of $numbers is $sum'); -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^ reference local 4 // ^^^ reference local 5 - + print(math.Rectangle(1,2,3,4)); -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). + + [1,2].reduce((a, b) => a + b); +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). +// ^ definition local 8 +// documentation ```dart +// ^ definition local 9 +// documentation ```dart +// ^ reference local 8 +// ^ reference local 9 } - + void test(String Function(int) p) {} // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/test(). // documentation ```dart -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# -// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# // ^ definition local 10 // documentation ```dart void deepTest(String Function(void Function(String test)) p) {} // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/deepTest(). // documentation ```dart -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# // ^ definition local 11 // documentation ```dart diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index bdbe3924..4c964982 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -38,7 +38,7 @@ _someValue = 'asdf'; // ^^^^^^^^^^ reference local 2 print(_someValue); -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^^^^ reference local 2 } } @@ -48,7 +48,7 @@ // documentation ```dart more.loadLibrary().then((_) => { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/more. -// ^^^^ reference scip-dart pub dart:async 3.0.0 dart:async/future.dart/Future#then(). +// ^^^^ reference scip-dart pub dart:async 3.1.0 dart:async/future.dart/Future#then(). // ^ definition local 4 // documentation ```dart Bar('a').someMethod.call() diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index 250a2609..3550193a 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -98,7 +98,7 @@ // documentation ```dart return switch (dt.weekday) { // ^^ reference local 10 -// ^^^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/date_time.dart/DateTime#weekday. +// ^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime#weekday. one => 'Feeling the Monday blues?', // ^^^ reference local 11 7 || six => 'Enjoy the weekend!', @@ -116,7 +116,7 @@ ) = userInfo({'name': 'Michael', 'height': 180}); // ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). print('User $name is $height cm tall.'); -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^ reference local 12 // ^^^^^^ reference local 13 @@ -127,7 +127,7 @@ if (json case {'name': 'Michael', 'height': int h}) { // ^^^^ reference local 14 print('Michael is $h cm tall.'); -// ^^^^^ reference scip-dart pub dart:core 3.0.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 15 } } diff --git a/snapshots/output/relationships-project/lib/main.dart b/snapshots/output/relationships-project/lib/main.dart index b99c84b9..f832922d 100755 --- a/snapshots/output/relationships-project/lib/main.dart +++ b/snapshots/output/relationships-project/lib/main.dart @@ -3,7 +3,6 @@ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# // documentation ```dart String get hierarchy; -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. // documentation ```dart } @@ -12,9 +11,7 @@ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# String sound() => 'NOISE!'; -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). // documentation ```dart } @@ -25,7 +22,7 @@ void execute() => print('swimming...'); // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction#execute(). // documentation ```dart -// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). } class Dog extends Animal with SwimAction { @@ -34,20 +31,16 @@ // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# implementation // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# implementation -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# @override -// ^^^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/annotations.dart/override. +// ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String sound() => 'woof'; -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#sound(). // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). implementation reference @override -// ^^^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/annotations.dart/override. +// ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String get hierarchy => 'dog.animal.mammal'; -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#hierarchy. // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. implementation reference From fb9f289a0f2549b98abf917cf9319a8e4c15b900 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Fri, 1 Sep 2023 09:37:40 -0600 Subject: [PATCH 05/27] fixed missed SimpleIdentifiers --- lib/src/scip_visitor.dart | 14 ++++++++++++++ snapshots/output/basic-project/lib/main.dart | 6 ++++++ snapshots/output/basic-project/lib/more.dart | 19 +++++++++++++++++++ snapshots/output/basic-project/lib/other.dart | 3 +++ snapshots/output/dart3-features/lib/main.dart | 13 +++++++++++++ .../relationships-project/lib/main.dart | 7 +++++++ 6 files changed, 62 insertions(+) diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index f080764b..77a87430 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -54,6 +54,8 @@ class ScipVisitor extends GeneralizingAstVisitor { _visitNormalFormalParameter(node); } else if (node is SimpleIdentifier) { _visitSimpleIdentifier(node); + } else if (node is TypeAnnotation) { + _visitTypeAnnotation(node); } super.visitNode(node); @@ -142,6 +144,18 @@ class ScipVisitor extends GeneralizingAstVisitor { } } + void _visitTypeAnnotation(TypeAnnotation node) { + final element = node.type?.element; + + if (element == null) return; + + _registerAsReference( + element, + offset: node.offset, + length: node.type!.getDisplayString(withNullability: false).length, + ); + } + /// Registers the provided [element] as a reference to an existing definition /// /// [node] refers to the ast node where the reference exists, [element] diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 721fe671..d90b5b2e 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -6,9 +6,11 @@ /// Takes a number /// Returns a number int fib(int n) { +//^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // documentation ```dart // documentation This is a fib function +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart if (n <= 1) return 0; @@ -23,6 +25,7 @@ void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart print(fib(a)); @@ -35,6 +38,7 @@ // ^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/y. // documentation ```dart String capture() { +//^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart return y; @@ -95,7 +99,9 @@ // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/someFunction(). // documentation ```dart // documentation Reference parameter: [value] +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^ definition local 5 // documentation ```dart Foo(1); +// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# } diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index f5a63dec..5d1a84c9 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -35,10 +35,13 @@ class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // documentation ```dart +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# String name; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart AnimalType type; +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // documentation ```dart SoundMaker? soundMaker; @@ -95,6 +98,7 @@ @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String toString() { +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart return '$name the $type'; @@ -104,8 +108,11 @@ } int calculateSum(List numbers) { +//^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart +// ^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart return numbers.reduce((value, element) => value + element); @@ -123,23 +130,30 @@ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart List numbers = [1, 2, 3, 4, 5]; +// ^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart int sum = calculateSum(numbers); +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition local 5 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // ^^^^^^^ reference local 4 Animal cat = Animal('Kitty', type: AnimalType.cat); +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 6 // documentation ```dart +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. Animal dog = Animal('Buddy', type: AnimalType.dog); +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 7 // documentation ```dart +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. @@ -171,6 +185,7 @@ print(math.Rectangle(1,2,3,4)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). +// ^^^^^^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# [1,2].reduce((a, b) => a + b); // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). @@ -185,10 +200,14 @@ void test(String Function(int) p) {} // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/test(). // documentation ```dart +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 10 // documentation ```dart void deepTest(String Function(void Function(String test)) p) {} // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/deepTest(). // documentation ```dart +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^ definition local 11 // documentation ```dart diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index 4c964982..dc13b506 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -7,6 +7,7 @@ // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // documentation ```dart int _far; +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart Foo(this._far); @@ -22,6 +23,7 @@ // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // documentation ```dart String _someValue; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^ definition local 2 // documentation ```dart Bar(this._someValue); @@ -52,6 +54,7 @@ // ^ definition local 4 // documentation ```dart Bar('a').someMethod.call() +// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). }); } diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index 3550193a..b1cd5b77 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -1,17 +1,24 @@ (String, int) userInfo(Map json) { // definition scip-dart pub dart3_features 1.0.0 lib/main.dart/ +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). // documentation ```dart +// ^^^^^^^^^^^^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/map.dart/Map# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition local 0 // documentation ```dart return (json['name'] as String, json['height'] as int); // ^^^^ reference local 0 +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ reference local 0 +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# } void parser(int charCode) { // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/parser(). // documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 1 // documentation ```dart const slash = 1; @@ -43,6 +50,7 @@ void operator(int charCode) {} // ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operator(). // documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 9 // documentation ```dart void number() {} @@ -89,8 +97,10 @@ // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/msg. // documentation ```dart String describeDate(DateTime dt) { +//^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/describeDate(). // documentation ```dart +// ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime# // ^^ definition local 10 // documentation ```dart const one = 1; @@ -112,7 +122,9 @@ // documentation ```dart var ( String name, +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# int height, +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# ) = userInfo({'name': 'Michael', 'height': 180}); // ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). print('User $name is $height cm tall.'); @@ -126,6 +138,7 @@ // documentation ```dart if (json case {'name': 'Michael', 'height': int h}) { // ^^^^ reference local 14 +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# print('Michael is $h cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 15 diff --git a/snapshots/output/relationships-project/lib/main.dart b/snapshots/output/relationships-project/lib/main.dart index f832922d..e717070d 100755 --- a/snapshots/output/relationships-project/lib/main.dart +++ b/snapshots/output/relationships-project/lib/main.dart @@ -3,6 +3,7 @@ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# // documentation ```dart String get hierarchy; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. // documentation ```dart } @@ -11,7 +12,9 @@ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# String sound() => 'NOISE!'; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). // documentation ```dart } @@ -31,9 +34,12 @@ // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# implementation // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# implementation +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String sound() => 'woof'; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#sound(). // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). implementation reference @@ -41,6 +47,7 @@ @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String get hierarchy => 'dog.animal.mammal'; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#hierarchy. // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. implementation reference From f0423b40a8e1f93d690c40668acf4103dc968803 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Fri, 1 Sep 2023 09:39:33 -0600 Subject: [PATCH 06/27] fixed name offset --- lib/src/scip_visitor.dart | 5 ++- snapshots/output/basic-project/lib/main.dart | 12 +++--- snapshots/output/basic-project/lib/more.dart | 38 +++++++++---------- snapshots/output/basic-project/lib/other.dart | 6 +-- snapshots/output/dart3-features/lib/main.dart | 26 ++++++------- .../relationships-project/lib/main.dart | 14 +++---- 6 files changed, 51 insertions(+), 50 deletions(-) diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index 77a87430..9f7fc7c9 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -149,10 +149,11 @@ class ScipVisitor extends GeneralizingAstVisitor { if (element == null) return; + _registerAsReference( element, - offset: node.offset, - length: node.type!.getDisplayString(withNullability: false).length, + offset: element.nameOffset, + length: element.nameLength, ); } diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index d90b5b2e..15e68a22 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -2,15 +2,14 @@ // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ /// This is a fib function +// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# /// /// Takes a number /// Returns a number int fib(int n) { -//^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // documentation ```dart // documentation This is a fib function -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart if (n <= 1) return 0; @@ -25,7 +24,6 @@ void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // documentation ```dart -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart print(fib(a)); @@ -38,7 +36,6 @@ // ^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/y. // documentation ```dart String capture() { -//^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart return y; @@ -99,9 +96,12 @@ // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/someFunction(). // documentation ```dart // documentation Reference parameter: [value] -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^ definition local 5 // documentation ```dart Foo(1); -// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# } +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index 5d1a84c9..b06fc914 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -6,6 +6,7 @@ enum AnimalType { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // documentation ```dart +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# cat, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. // documentation ```dart @@ -24,6 +25,7 @@ mixin SleepMixin { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# // documentation ```dart +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# void sleep() { // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). // documentation ```dart @@ -35,13 +37,14 @@ class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // documentation ```dart -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# String name; -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart AnimalType type; -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // documentation ```dart SoundMaker? soundMaker; @@ -98,7 +101,6 @@ @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String toString() { -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart return '$name the $type'; @@ -108,11 +110,8 @@ } int calculateSum(List numbers) { -//^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart -// ^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart return numbers.reduce((value, element) => value + element); @@ -130,30 +129,23 @@ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart List numbers = [1, 2, 3, 4, 5]; -// ^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart int sum = calculateSum(numbers); -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition local 5 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // ^^^^^^^ reference local 4 Animal cat = Animal('Kitty', type: AnimalType.cat); -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 6 // documentation ```dart -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. Animal dog = Animal('Buddy', type: AnimalType.dog); -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 7 // documentation ```dart -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. @@ -185,7 +177,6 @@ print(math.Rectangle(1,2,3,4)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). -// ^^^^^^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# [1,2].reduce((a, b) => a + b); // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). @@ -193,6 +184,11 @@ // documentation ```dart // ^ definition local 9 // documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ reference local 8 // ^ reference local 9 } @@ -200,14 +196,18 @@ void test(String Function(int) p) {} // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/test(). // documentation ```dart -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 10 // documentation ```dart void deepTest(String Function(void Function(String test)) p) {} // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/deepTest(). // documentation ```dart -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^ definition local 11 // documentation ```dart +// ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# +// ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index dc13b506..2b7f72a3 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -7,7 +7,6 @@ // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // documentation ```dart int _far; -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart Foo(this._far); @@ -22,8 +21,8 @@ class Bar { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // documentation ```dart +// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# String _someValue; -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^ definition local 2 // documentation ```dart Bar(this._someValue); @@ -54,7 +53,8 @@ // ^ definition local 4 // documentation ```dart Bar('a').someMethod.call() -// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). }); } +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index b1cd5b77..4992cff0 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -1,24 +1,17 @@ (String, int) userInfo(Map json) { // definition scip-dart pub dart3_features 1.0.0 lib/main.dart/ -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). // documentation ```dart -// ^^^^^^^^^^^^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/map.dart/Map# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition local 0 // documentation ```dart return (json['name'] as String, json['height'] as int); // ^^^^ reference local 0 -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ reference local 0 -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# } void parser(int charCode) { // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/parser(). // documentation ```dart -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 1 // documentation ```dart const slash = 1; @@ -50,7 +43,6 @@ void operator(int charCode) {} // ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operator(). // documentation ```dart -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 9 // documentation ```dart void number() {} @@ -97,10 +89,8 @@ // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/msg. // documentation ```dart String describeDate(DateTime dt) { -//^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/describeDate(). // documentation ```dart -// ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime# // ^^ definition local 10 // documentation ```dart const one = 1; @@ -122,9 +112,7 @@ // documentation ```dart var ( String name, -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# int height, -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# ) = userInfo({'name': 'Michael', 'height': 180}); // ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). print('User $name is $height cm tall.'); @@ -138,7 +126,6 @@ // documentation ```dart if (json case {'name': 'Michael', 'height': int h}) { // ^^^^ reference local 14 -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# print('Michael is $h cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 15 @@ -157,3 +144,16 @@ sealed class Zar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Zar# // documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/map.dart/Map# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime# diff --git a/snapshots/output/relationships-project/lib/main.dart b/snapshots/output/relationships-project/lib/main.dart index e717070d..ddd4d0a6 100755 --- a/snapshots/output/relationships-project/lib/main.dart +++ b/snapshots/output/relationships-project/lib/main.dart @@ -2,8 +2,8 @@ // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# // documentation ```dart +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# String get hierarchy; -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. // documentation ```dart } @@ -12,9 +12,8 @@ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# String sound() => 'NOISE!'; -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). // documentation ```dart } @@ -22,6 +21,7 @@ mixin SwimAction { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# // documentation ```dart +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# void execute() => print('swimming...'); // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction#execute(). // documentation ```dart @@ -34,12 +34,9 @@ // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# implementation // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# implementation -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String sound() => 'woof'; -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#sound(). // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). implementation reference @@ -47,8 +44,11 @@ @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String get hierarchy => 'dog.animal.mammal'; -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#hierarchy. // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. implementation reference } +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# From 305be00466f22e23de0293391223c693e8e7ab47 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Fri, 1 Sep 2023 09:40:59 -0600 Subject: [PATCH 07/27] fixed bad offset calculation --- lib/src/scip_visitor.dart | 4 +- snapshots/output/basic-project/lib/main.dart | 12 +++--- snapshots/output/basic-project/lib/more.dart | 38 +++++++++---------- snapshots/output/basic-project/lib/other.dart | 6 +-- snapshots/output/dart3-features/lib/main.dart | 26 ++++++------- .../relationships-project/lib/main.dart | 14 +++---- 6 files changed, 50 insertions(+), 50 deletions(-) diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index 9f7fc7c9..f7d2c71a 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -152,8 +152,8 @@ class ScipVisitor extends GeneralizingAstVisitor { _registerAsReference( element, - offset: element.nameOffset, - length: element.nameLength, + offset: node.offset, + length: node.type!.getDisplayString(withNullability: false).length, ); } diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 15e68a22..d90b5b2e 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -2,14 +2,15 @@ // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ /// This is a fib function -// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# /// /// Takes a number /// Returns a number int fib(int n) { +//^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // documentation ```dart // documentation This is a fib function +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart if (n <= 1) return 0; @@ -24,6 +25,7 @@ void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart print(fib(a)); @@ -36,6 +38,7 @@ // ^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/y. // documentation ```dart String capture() { +//^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart return y; @@ -96,12 +99,9 @@ // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/someFunction(). // documentation ```dart // documentation Reference parameter: [value] +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^ definition local 5 // documentation ```dart Foo(1); +// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# } -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index b06fc914..5d1a84c9 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -6,7 +6,6 @@ enum AnimalType { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // documentation ```dart -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# cat, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. // documentation ```dart @@ -25,7 +24,6 @@ mixin SleepMixin { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# // documentation ```dart -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# void sleep() { // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). // documentation ```dart @@ -37,14 +35,13 @@ class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // documentation ```dart -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# String name; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart AnimalType type; +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // documentation ```dart SoundMaker? soundMaker; @@ -101,6 +98,7 @@ @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String toString() { +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart return '$name the $type'; @@ -110,8 +108,11 @@ } int calculateSum(List numbers) { +//^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart +// ^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart return numbers.reduce((value, element) => value + element); @@ -129,23 +130,30 @@ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart List numbers = [1, 2, 3, 4, 5]; +// ^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart int sum = calculateSum(numbers); +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition local 5 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // ^^^^^^^ reference local 4 Animal cat = Animal('Kitty', type: AnimalType.cat); +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 6 // documentation ```dart +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. Animal dog = Animal('Buddy', type: AnimalType.dog); +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 7 // documentation ```dart +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. @@ -177,6 +185,7 @@ print(math.Rectangle(1,2,3,4)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). +// ^^^^^^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# [1,2].reduce((a, b) => a + b); // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). @@ -184,11 +193,6 @@ // documentation ```dart // ^ definition local 9 // documentation ```dart -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ reference local 8 // ^ reference local 9 } @@ -196,18 +200,14 @@ void test(String Function(int) p) {} // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/test(). // documentation ```dart +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 10 // documentation ```dart void deepTest(String Function(void Function(String test)) p) {} // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/deepTest(). // documentation ```dart +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^ definition local 11 // documentation ```dart -// ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# -// ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index 2b7f72a3..dc13b506 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -7,6 +7,7 @@ // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // documentation ```dart int _far; +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart Foo(this._far); @@ -21,8 +22,8 @@ class Bar { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // documentation ```dart -// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# String _someValue; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^ definition local 2 // documentation ```dart Bar(this._someValue); @@ -53,8 +54,7 @@ // ^ definition local 4 // documentation ```dart Bar('a').someMethod.call() +// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). }); } -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index 4992cff0..b1cd5b77 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -1,17 +1,24 @@ (String, int) userInfo(Map json) { // definition scip-dart pub dart3_features 1.0.0 lib/main.dart/ +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). // documentation ```dart +// ^^^^^^^^^^^^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/map.dart/Map# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition local 0 // documentation ```dart return (json['name'] as String, json['height'] as int); // ^^^^ reference local 0 +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ reference local 0 +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# } void parser(int charCode) { // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/parser(). // documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 1 // documentation ```dart const slash = 1; @@ -43,6 +50,7 @@ void operator(int charCode) {} // ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operator(). // documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 9 // documentation ```dart void number() {} @@ -89,8 +97,10 @@ // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/msg. // documentation ```dart String describeDate(DateTime dt) { +//^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/describeDate(). // documentation ```dart +// ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime# // ^^ definition local 10 // documentation ```dart const one = 1; @@ -112,7 +122,9 @@ // documentation ```dart var ( String name, +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# int height, +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# ) = userInfo({'name': 'Michael', 'height': 180}); // ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). print('User $name is $height cm tall.'); @@ -126,6 +138,7 @@ // documentation ```dart if (json case {'name': 'Michael', 'height': int h}) { // ^^^^ reference local 14 +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# print('Michael is $h cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 15 @@ -144,16 +157,3 @@ sealed class Zar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Zar# // documentation ```dart -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/map.dart/Map# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime# diff --git a/snapshots/output/relationships-project/lib/main.dart b/snapshots/output/relationships-project/lib/main.dart index ddd4d0a6..e717070d 100755 --- a/snapshots/output/relationships-project/lib/main.dart +++ b/snapshots/output/relationships-project/lib/main.dart @@ -2,8 +2,8 @@ // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# // documentation ```dart -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# String get hierarchy; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. // documentation ```dart } @@ -12,8 +12,9 @@ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation -// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# String sound() => 'NOISE!'; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). // documentation ```dart } @@ -21,7 +22,6 @@ mixin SwimAction { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# // documentation ```dart -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# void execute() => print('swimming...'); // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction#execute(). // documentation ```dart @@ -34,9 +34,12 @@ // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# implementation // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# implementation +// ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String sound() => 'woof'; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#sound(). // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). implementation reference @@ -44,11 +47,8 @@ @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. String get hierarchy => 'dog.animal.mammal'; +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#hierarchy. // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. implementation reference } -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# From 21fbc87097603f99698499c410ea9b7feff85499 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Fri, 1 Sep 2023 09:42:29 -0600 Subject: [PATCH 08/27] actually fixed it this time --- lib/src/scip_visitor.dart | 2 +- snapshots/output/basic-project/lib/more.dart | 6 +++--- snapshots/output/dart3-features/lib/main.dart | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index f7d2c71a..12c3fdc9 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -153,7 +153,7 @@ class ScipVisitor extends GeneralizingAstVisitor { _registerAsReference( element, offset: node.offset, - length: node.type!.getDisplayString(withNullability: false).length, + length: element.nameLength, ); } diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index 5d1a84c9..87014909 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -111,7 +111,7 @@ //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart -// ^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# +// ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart @@ -130,7 +130,7 @@ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart List numbers = [1, 2, 3, 4, 5]; -// ^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# +// ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart @@ -185,7 +185,7 @@ print(math.Rectangle(1,2,3,4)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). -// ^^^^^^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# +// ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# [1,2].reduce((a, b) => a + b); // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index b1cd5b77..0de4afdd 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -4,7 +4,7 @@ // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). // documentation ```dart -// ^^^^^^^^^^^^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/map.dart/Map# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/map.dart/Map# // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition local 0 // documentation ```dart From fbd7cb318b7f9585cb33b2765dc715032040ed93 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Fri, 1 Sep 2023 10:05:08 -0600 Subject: [PATCH 09/27] renamed so github doesnt incorrectly name function --- lib/src/scip_visitor.dart | 2 -- snapshots/input/dart3-features/lib/main.dart | 4 ++-- snapshots/output/dart3-features/lib/main.dart | 16 ++++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index 12c3fdc9..22b32ac0 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -148,8 +148,6 @@ class ScipVisitor extends GeneralizingAstVisitor { final element = node.type?.element; if (element == null) return; - - _registerAsReference( element, offset: node.offset, diff --git a/snapshots/input/dart3-features/lib/main.dart b/snapshots/input/dart3-features/lib/main.dart index cd779548..f8c5d472 100644 --- a/snapshots/input/dart3-features/lib/main.dart +++ b/snapshots/input/dart3-features/lib/main.dart @@ -13,7 +13,7 @@ void parser(int charCode) { const digit9 = 9; void skipComment() {} - void operator(int charCode) {} + void operatorFn(int charCode) {} void number() {} void invalid() {} @@ -22,7 +22,7 @@ void parser(int charCode) { skipComment(); case slash || star || plus || minus: - operator(charCode); + operatorFn(charCode); case >= digit0 && <= digit9: number(); diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index 0de4afdd..a5f95a72 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -47,12 +47,12 @@ void skipComment() {} // ^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). // documentation ```dart - void operator(int charCode) {} -// ^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operator(). + void operatorFn(int charCode) {} +// ^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // documentation ```dart -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -// ^^^^^^^^ definition local 9 -// documentation ```dart +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^^^^^^ definition local 9 +// documentation ```dart void number() {} // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). // documentation ```dart @@ -74,9 +74,9 @@ // ^^^^ reference local 3 // ^^^^ reference local 4 // ^^^^^ reference local 5 - operator(charCode); -// ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/operator(). -// ^^^^^^^^ reference local 1 + operatorFn(charCode); +// ^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). +// ^^^^^^^^ reference local 1 case >= digit0 && <= digit9: // ^^^^^^ reference local 7 From 28e6a5eac6b137b7524c0448f05195066eb865e1 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Fri, 1 Sep 2023 10:07:27 -0600 Subject: [PATCH 10/27] fixed tests --- .github/workflows/tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4c680288..69daf7d2 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -20,7 +20,7 @@ jobs: - uses: dart-lang/setup-dart@v1 with: # use a fixed version number so changes to 'stable', dont break snapshot diffs (language version is used in the scip symbol) - sdk: 2.18.7 + sdk: 3.1.0 - name: pub get scip-dart package run: dart pub get @@ -68,7 +68,7 @@ jobs: - uses: actions/checkout@v3 - uses: dart-lang/setup-dart@v1 with: - sdk: 2.18.7 + sdk: 3.1.0 - run: dart pub get # Setup repo to run on From 452f67c329aaacc1c19f679fb9e14b5d32999bde Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Fri, 1 Sep 2023 10:09:14 -0600 Subject: [PATCH 11/27] fmt --- lib/src/gen/scip.pb.dart | 663 ++++++++++++------ lib/src/gen/scip.pbenum.dart | 312 ++++++--- lib/src/gen/scip.pbjson.dart | 169 ++++- lib/src/gen/scip.pbserver.dart | 1 - snapshots/input/basic-project/lib/main.dart | 2 +- snapshots/input/basic-project/lib/more.dart | 6 +- snapshots/input/basic-project/lib/other.dart | 6 +- .../input/basic-project/test/basic_test.dart | 2 +- snapshots/input/dart3-features/lib/main.dart | 12 +- .../input/relationships-project/lib/main.dart | 2 +- snapshots/output/basic-project/lib/main.dart | 94 +-- snapshots/output/basic-project/lib/more.dart | 144 ++-- snapshots/output/basic-project/lib/other.dart | 42 +- .../output/basic-project/test/basic_test.dart | 16 +- snapshots/output/dart3-features/lib/main.dart | 124 ++-- .../relationships-project/lib/main.dart | 38 +- 16 files changed, 1028 insertions(+), 605 deletions(-) diff --git a/lib/src/gen/scip.pb.dart b/lib/src/gen/scip.pb.dart index 80511020..55e508d3 100644 --- a/lib/src/gen/scip.pb.dart +++ b/lib/src/gen/scip.pb.dart @@ -42,26 +42,35 @@ class Index extends $pb.GeneratedMessage { return $result; } Index._() : super(); - factory Index.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Index.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Index', package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'metadata', subBuilder: Metadata.create) - ..pc(2, _omitFieldNames ? '' : 'documents', $pb.PbFieldType.PM, subBuilder: Document.create) - ..pc(3, _omitFieldNames ? '' : 'externalSymbols', $pb.PbFieldType.PM, subBuilder: SymbolInformation.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory Index.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Index.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Index', + package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), + createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'metadata', + subBuilder: Metadata.create) + ..pc(2, _omitFieldNames ? '' : 'documents', $pb.PbFieldType.PM, + subBuilder: Document.create) + ..pc( + 3, _omitFieldNames ? '' : 'externalSymbols', $pb.PbFieldType.PM, + subBuilder: SymbolInformation.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Index clone() => Index()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Index copyWith(void Function(Index) updates) => super.copyWith((message) => updates(message as Index)) as Index; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Index copyWith(void Function(Index) updates) => + super.copyWith((message) => updates(message as Index)) as Index; $pb.BuilderInfo get info_ => _i; @@ -70,14 +79,18 @@ class Index extends $pb.GeneratedMessage { Index createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Index getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Index getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Index? _defaultInstance; /// Metadata about this index. @$pb.TagNumber(1) Metadata get metadata => $_getN(0); @$pb.TagNumber(1) - set metadata(Metadata v) { setField(1, v); } + set metadata(Metadata v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasMetadata() => $_has(0); @$pb.TagNumber(1) @@ -121,27 +134,41 @@ class Metadata extends $pb.GeneratedMessage { return $result; } Metadata._() : super(); - factory Metadata.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Metadata.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Metadata', package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), createEmptyInstance: create) - ..e(1, _omitFieldNames ? '' : 'version', $pb.PbFieldType.OE, defaultOrMaker: ProtocolVersion.UnspecifiedProtocolVersion, valueOf: ProtocolVersion.valueOf, enumValues: ProtocolVersion.values) - ..aOM(2, _omitFieldNames ? '' : 'toolInfo', subBuilder: ToolInfo.create) + factory Metadata.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Metadata.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Metadata', + package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), + createEmptyInstance: create) + ..e( + 1, _omitFieldNames ? '' : 'version', $pb.PbFieldType.OE, + defaultOrMaker: ProtocolVersion.UnspecifiedProtocolVersion, + valueOf: ProtocolVersion.valueOf, + enumValues: ProtocolVersion.values) + ..aOM(2, _omitFieldNames ? '' : 'toolInfo', + subBuilder: ToolInfo.create) ..aOS(3, _omitFieldNames ? '' : 'projectRoot') - ..e(4, _omitFieldNames ? '' : 'textDocumentEncoding', $pb.PbFieldType.OE, defaultOrMaker: TextEncoding.UnspecifiedTextEncoding, valueOf: TextEncoding.valueOf, enumValues: TextEncoding.values) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..e( + 4, _omitFieldNames ? '' : 'textDocumentEncoding', $pb.PbFieldType.OE, + defaultOrMaker: TextEncoding.UnspecifiedTextEncoding, + valueOf: TextEncoding.valueOf, + enumValues: TextEncoding.values) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Metadata clone() => Metadata()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Metadata copyWith(void Function(Metadata) updates) => super.copyWith((message) => updates(message as Metadata)) as Metadata; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Metadata copyWith(void Function(Metadata) updates) => + super.copyWith((message) => updates(message as Metadata)) as Metadata; $pb.BuilderInfo get info_ => _i; @@ -150,14 +177,18 @@ class Metadata extends $pb.GeneratedMessage { Metadata createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Metadata getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Metadata getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Metadata? _defaultInstance; /// Which version of this protocol was used to generate this index? @$pb.TagNumber(1) ProtocolVersion get version => $_getN(0); @$pb.TagNumber(1) - set version(ProtocolVersion v) { setField(1, v); } + set version(ProtocolVersion v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasVersion() => $_has(0); @$pb.TagNumber(1) @@ -167,7 +198,10 @@ class Metadata extends $pb.GeneratedMessage { @$pb.TagNumber(2) ToolInfo get toolInfo => $_getN(1); @$pb.TagNumber(2) - set toolInfo(ToolInfo v) { setField(2, v); } + set toolInfo(ToolInfo v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasToolInfo() => $_has(1); @$pb.TagNumber(2) @@ -181,7 +215,10 @@ class Metadata extends $pb.GeneratedMessage { @$pb.TagNumber(3) $core.String get projectRoot => $_getSZ(2); @$pb.TagNumber(3) - set projectRoot($core.String v) { $_setString(2, v); } + set projectRoot($core.String v) { + $_setString(2, v); + } + @$pb.TagNumber(3) $core.bool hasProjectRoot() => $_has(2); @$pb.TagNumber(3) @@ -192,7 +229,10 @@ class Metadata extends $pb.GeneratedMessage { @$pb.TagNumber(4) TextEncoding get textDocumentEncoding => $_getN(3); @$pb.TagNumber(4) - set textDocumentEncoding(TextEncoding v) { setField(4, v); } + set textDocumentEncoding(TextEncoding v) { + setField(4, v); + } + @$pb.TagNumber(4) $core.bool hasTextDocumentEncoding() => $_has(3); @$pb.TagNumber(4) @@ -218,26 +258,31 @@ class ToolInfo extends $pb.GeneratedMessage { return $result; } ToolInfo._() : super(); - factory ToolInfo.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory ToolInfo.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ToolInfo', package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), createEmptyInstance: create) + factory ToolInfo.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory ToolInfo.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'ToolInfo', + package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), + createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'name') ..aOS(2, _omitFieldNames ? '' : 'version') ..pPS(3, _omitFieldNames ? '' : 'arguments') - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') ToolInfo clone() => ToolInfo()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - ToolInfo copyWith(void Function(ToolInfo) updates) => super.copyWith((message) => updates(message as ToolInfo)) as ToolInfo; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + ToolInfo copyWith(void Function(ToolInfo) updates) => + super.copyWith((message) => updates(message as ToolInfo)) as ToolInfo; $pb.BuilderInfo get info_ => _i; @@ -246,14 +291,18 @@ class ToolInfo extends $pb.GeneratedMessage { ToolInfo createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static ToolInfo getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static ToolInfo getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static ToolInfo? _defaultInstance; /// Name of the indexer that produced this index. @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { $_setString(0, v); } + set name($core.String v) { + $_setString(0, v); + } + @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -263,7 +312,10 @@ class ToolInfo extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.String get version => $_getSZ(1); @$pb.TagNumber(2) - set version($core.String v) { $_setString(1, v); } + set version($core.String v) { + $_setString(1, v); + } + @$pb.TagNumber(2) $core.bool hasVersion() => $_has(1); @$pb.TagNumber(2) @@ -298,27 +350,36 @@ class Document extends $pb.GeneratedMessage { return $result; } Document._() : super(); - factory Document.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Document.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Document', package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), createEmptyInstance: create) + factory Document.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Document.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Document', + package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), + createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'relativePath') - ..pc(2, _omitFieldNames ? '' : 'occurrences', $pb.PbFieldType.PM, subBuilder: Occurrence.create) - ..pc(3, _omitFieldNames ? '' : 'symbols', $pb.PbFieldType.PM, subBuilder: SymbolInformation.create) + ..pc( + 2, _omitFieldNames ? '' : 'occurrences', $pb.PbFieldType.PM, + subBuilder: Occurrence.create) + ..pc( + 3, _omitFieldNames ? '' : 'symbols', $pb.PbFieldType.PM, + subBuilder: SymbolInformation.create) ..aOS(4, _omitFieldNames ? '' : 'language') - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Document clone() => Document()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Document copyWith(void Function(Document) updates) => super.copyWith((message) => updates(message as Document)) as Document; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Document copyWith(void Function(Document) updates) => + super.copyWith((message) => updates(message as Document)) as Document; $pb.BuilderInfo get info_ => _i; @@ -327,7 +388,8 @@ class Document extends $pb.GeneratedMessage { Document createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Document getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Document getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Document? _defaultInstance; /// (Required) Unique path to the text document. @@ -342,7 +404,10 @@ class Document extends $pb.GeneratedMessage { @$pb.TagNumber(1) $core.String get relativePath => $_getSZ(0); @$pb.TagNumber(1) - set relativePath($core.String v) { $_setString(0, v); } + set relativePath($core.String v) { + $_setString(0, v); + } + @$pb.TagNumber(1) $core.bool hasRelativePath() => $_has(0); @$pb.TagNumber(1) @@ -367,7 +432,10 @@ class Document extends $pb.GeneratedMessage { @$pb.TagNumber(4) $core.String get language => $_getSZ(3); @$pb.TagNumber(4) - set language($core.String v) { $_setString(3, v); } + set language($core.String v) { + $_setString(3, v); + } + @$pb.TagNumber(4) $core.bool hasLanguage() => $_has(3); @$pb.TagNumber(4) @@ -429,26 +497,34 @@ class Symbol extends $pb.GeneratedMessage { return $result; } Symbol._() : super(); - factory Symbol.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Symbol.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Symbol', package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), createEmptyInstance: create) + factory Symbol.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Symbol.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Symbol', + package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), + createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'scheme') - ..aOM(2, _omitFieldNames ? '' : 'package', subBuilder: Package.create) - ..pc(3, _omitFieldNames ? '' : 'descriptors', $pb.PbFieldType.PM, subBuilder: Descriptor.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..aOM(2, _omitFieldNames ? '' : 'package', + subBuilder: Package.create) + ..pc( + 3, _omitFieldNames ? '' : 'descriptors', $pb.PbFieldType.PM, + subBuilder: Descriptor.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Symbol clone() => Symbol()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Symbol copyWith(void Function(Symbol) updates) => super.copyWith((message) => updates(message as Symbol)) as Symbol; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Symbol copyWith(void Function(Symbol) updates) => + super.copyWith((message) => updates(message as Symbol)) as Symbol; $pb.BuilderInfo get info_ => _i; @@ -457,13 +533,17 @@ class Symbol extends $pb.GeneratedMessage { Symbol createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Symbol getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Symbol getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Symbol? _defaultInstance; @$pb.TagNumber(1) $core.String get scheme => $_getSZ(0); @$pb.TagNumber(1) - set scheme($core.String v) { $_setString(0, v); } + set scheme($core.String v) { + $_setString(0, v); + } + @$pb.TagNumber(1) $core.bool hasScheme() => $_has(0); @$pb.TagNumber(1) @@ -472,7 +552,10 @@ class Symbol extends $pb.GeneratedMessage { @$pb.TagNumber(2) Package get package => $_getN(1); @$pb.TagNumber(2) - set package(Package v) { setField(2, v); } + set package(Package v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasPackage() => $_has(1); @$pb.TagNumber(2) @@ -506,26 +589,31 @@ class Package extends $pb.GeneratedMessage { return $result; } Package._() : super(); - factory Package.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Package.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Package', package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), createEmptyInstance: create) + factory Package.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Package.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Package', + package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), + createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'manager') ..aOS(2, _omitFieldNames ? '' : 'name') ..aOS(3, _omitFieldNames ? '' : 'version') - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Package clone() => Package()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Package copyWith(void Function(Package) updates) => super.copyWith((message) => updates(message as Package)) as Package; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Package copyWith(void Function(Package) updates) => + super.copyWith((message) => updates(message as Package)) as Package; $pb.BuilderInfo get info_ => _i; @@ -534,13 +622,17 @@ class Package extends $pb.GeneratedMessage { Package createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Package getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Package getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Package? _defaultInstance; @$pb.TagNumber(1) $core.String get manager => $_getSZ(0); @$pb.TagNumber(1) - set manager($core.String v) { $_setString(0, v); } + set manager($core.String v) { + $_setString(0, v); + } + @$pb.TagNumber(1) $core.bool hasManager() => $_has(0); @$pb.TagNumber(1) @@ -549,7 +641,10 @@ class Package extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.String get name => $_getSZ(1); @$pb.TagNumber(2) - set name($core.String v) { $_setString(1, v); } + set name($core.String v) { + $_setString(1, v); + } + @$pb.TagNumber(2) $core.bool hasName() => $_has(1); @$pb.TagNumber(2) @@ -558,7 +653,10 @@ class Package extends $pb.GeneratedMessage { @$pb.TagNumber(3) $core.String get version => $_getSZ(2); @$pb.TagNumber(3) - set version($core.String v) { $_setString(2, v); } + set version($core.String v) { + $_setString(2, v); + } + @$pb.TagNumber(3) $core.bool hasVersion() => $_has(2); @$pb.TagNumber(3) @@ -584,26 +682,35 @@ class Descriptor extends $pb.GeneratedMessage { return $result; } Descriptor._() : super(); - factory Descriptor.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Descriptor.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Descriptor', package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), createEmptyInstance: create) + factory Descriptor.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Descriptor.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Descriptor', + package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), + createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'name') ..aOS(2, _omitFieldNames ? '' : 'disambiguator') - ..e(3, _omitFieldNames ? '' : 'suffix', $pb.PbFieldType.OE, defaultOrMaker: Descriptor_Suffix.UnspecifiedSuffix, valueOf: Descriptor_Suffix.valueOf, enumValues: Descriptor_Suffix.values) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..e( + 3, _omitFieldNames ? '' : 'suffix', $pb.PbFieldType.OE, + defaultOrMaker: Descriptor_Suffix.UnspecifiedSuffix, + valueOf: Descriptor_Suffix.valueOf, + enumValues: Descriptor_Suffix.values) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Descriptor clone() => Descriptor()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Descriptor copyWith(void Function(Descriptor) updates) => super.copyWith((message) => updates(message as Descriptor)) as Descriptor; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Descriptor copyWith(void Function(Descriptor) updates) => + super.copyWith((message) => updates(message as Descriptor)) as Descriptor; $pb.BuilderInfo get info_ => _i; @@ -612,13 +719,17 @@ class Descriptor extends $pb.GeneratedMessage { Descriptor createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Descriptor getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Descriptor getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static Descriptor? _defaultInstance; @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { $_setString(0, v); } + set name($core.String v) { + $_setString(0, v); + } + @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -627,7 +738,10 @@ class Descriptor extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.String get disambiguator => $_getSZ(1); @$pb.TagNumber(2) - set disambiguator($core.String v) { $_setString(1, v); } + set disambiguator($core.String v) { + $_setString(1, v); + } + @$pb.TagNumber(2) $core.bool hasDisambiguator() => $_has(1); @$pb.TagNumber(2) @@ -636,7 +750,10 @@ class Descriptor extends $pb.GeneratedMessage { @$pb.TagNumber(3) Descriptor_Suffix get suffix => $_getN(2); @$pb.TagNumber(3) - set suffix(Descriptor_Suffix v) { setField(3, v); } + set suffix(Descriptor_Suffix v) { + setField(3, v); + } + @$pb.TagNumber(3) $core.bool hasSuffix() => $_has(2); @$pb.TagNumber(3) @@ -664,35 +781,45 @@ class SymbolInformation extends $pb.GeneratedMessage { return $result; } SymbolInformation._() : super(); - factory SymbolInformation.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory SymbolInformation.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SymbolInformation', package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), createEmptyInstance: create) + factory SymbolInformation.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory SymbolInformation.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'SymbolInformation', + package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), + createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'symbol') ..pPS(3, _omitFieldNames ? '' : 'documentation') - ..pc(4, _omitFieldNames ? '' : 'relationships', $pb.PbFieldType.PM, subBuilder: Relationship.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..pc( + 4, _omitFieldNames ? '' : 'relationships', $pb.PbFieldType.PM, + subBuilder: Relationship.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') SymbolInformation clone() => SymbolInformation()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - SymbolInformation copyWith(void Function(SymbolInformation) updates) => super.copyWith((message) => updates(message as SymbolInformation)) as SymbolInformation; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + SymbolInformation copyWith(void Function(SymbolInformation) updates) => + super.copyWith((message) => updates(message as SymbolInformation)) + as SymbolInformation; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static SymbolInformation create() => SymbolInformation._(); SymbolInformation createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static SymbolInformation getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static SymbolInformation getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static SymbolInformation? _defaultInstance; /// Identifier of this symbol, which can be referenced from `Occurence.symbol`. @@ -700,7 +827,10 @@ class SymbolInformation extends $pb.GeneratedMessage { @$pb.TagNumber(1) $core.String get symbol => $_getSZ(0); @$pb.TagNumber(1) - set symbol($core.String v) { $_setString(0, v); } + set symbol($core.String v) { + $_setString(0, v); + } + @$pb.TagNumber(1) $core.bool hasSymbol() => $_has(0); @$pb.TagNumber(1) @@ -745,43 +875,54 @@ class Relationship extends $pb.GeneratedMessage { return $result; } Relationship._() : super(); - factory Relationship.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Relationship.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Relationship', package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), createEmptyInstance: create) + factory Relationship.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Relationship.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Relationship', + package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), + createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'symbol') ..aOB(2, _omitFieldNames ? '' : 'isReference') ..aOB(3, _omitFieldNames ? '' : 'isImplementation') ..aOB(4, _omitFieldNames ? '' : 'isTypeDefinition') ..aOB(5, _omitFieldNames ? '' : 'isDefinition') - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Relationship clone() => Relationship()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Relationship copyWith(void Function(Relationship) updates) => super.copyWith((message) => updates(message as Relationship)) as Relationship; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Relationship copyWith(void Function(Relationship) updates) => + super.copyWith((message) => updates(message as Relationship)) + as Relationship; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Relationship create() => Relationship._(); Relationship createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static Relationship getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Relationship getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static Relationship? _defaultInstance; @$pb.TagNumber(1) $core.String get symbol => $_getSZ(0); @$pb.TagNumber(1) - set symbol($core.String v) { $_setString(0, v); } + set symbol($core.String v) { + $_setString(0, v); + } + @$pb.TagNumber(1) $core.bool hasSymbol() => $_has(0); @$pb.TagNumber(1) @@ -814,7 +955,10 @@ class Relationship extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.bool get isReference => $_getBF(1); @$pb.TagNumber(2) - set isReference($core.bool v) { $_setBool(1, v); } + set isReference($core.bool v) { + $_setBool(1, v); + } + @$pb.TagNumber(2) $core.bool hasIsReference() => $_has(1); @$pb.TagNumber(2) @@ -831,7 +975,10 @@ class Relationship extends $pb.GeneratedMessage { @$pb.TagNumber(3) $core.bool get isImplementation => $_getBF(2); @$pb.TagNumber(3) - set isImplementation($core.bool v) { $_setBool(2, v); } + set isImplementation($core.bool v) { + $_setBool(2, v); + } + @$pb.TagNumber(3) $core.bool hasIsImplementation() => $_has(2); @$pb.TagNumber(3) @@ -841,7 +988,10 @@ class Relationship extends $pb.GeneratedMessage { @$pb.TagNumber(4) $core.bool get isTypeDefinition => $_getBF(3); @$pb.TagNumber(4) - set isTypeDefinition($core.bool v) { $_setBool(3, v); } + set isTypeDefinition($core.bool v) { + $_setBool(3, v); + } + @$pb.TagNumber(4) $core.bool hasIsTypeDefinition() => $_has(3); @$pb.TagNumber(4) @@ -866,7 +1016,10 @@ class Relationship extends $pb.GeneratedMessage { @$pb.TagNumber(5) $core.bool get isDefinition => $_getBF(4); @$pb.TagNumber(5) - set isDefinition($core.bool v) { $_setBool(4, v); } + set isDefinition($core.bool v) { + $_setBool(4, v); + } + @$pb.TagNumber(5) $core.bool hasIsDefinition() => $_has(4); @$pb.TagNumber(5) @@ -909,29 +1062,39 @@ class Occurrence extends $pb.GeneratedMessage { return $result; } Occurrence._() : super(); - factory Occurrence.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Occurrence.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Occurrence', package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), createEmptyInstance: create) + factory Occurrence.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Occurrence.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Occurrence', + package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), + createEmptyInstance: create) ..p<$core.int>(1, _omitFieldNames ? '' : 'range', $pb.PbFieldType.K3) ..aOS(2, _omitFieldNames ? '' : 'symbol') ..a<$core.int>(3, _omitFieldNames ? '' : 'symbolRoles', $pb.PbFieldType.O3) ..pPS(4, _omitFieldNames ? '' : 'overrideDocumentation') - ..e(5, _omitFieldNames ? '' : 'syntaxKind', $pb.PbFieldType.OE, defaultOrMaker: SyntaxKind.UnspecifiedSyntaxKind, valueOf: SyntaxKind.valueOf, enumValues: SyntaxKind.values) - ..pc(6, _omitFieldNames ? '' : 'diagnostics', $pb.PbFieldType.PM, subBuilder: Diagnostic.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..e(5, _omitFieldNames ? '' : 'syntaxKind', $pb.PbFieldType.OE, + defaultOrMaker: SyntaxKind.UnspecifiedSyntaxKind, + valueOf: SyntaxKind.valueOf, + enumValues: SyntaxKind.values) + ..pc( + 6, _omitFieldNames ? '' : 'diagnostics', $pb.PbFieldType.PM, + subBuilder: Diagnostic.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Occurrence clone() => Occurrence()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Occurrence copyWith(void Function(Occurrence) updates) => super.copyWith((message) => updates(message as Occurrence)) as Occurrence; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Occurrence copyWith(void Function(Occurrence) updates) => + super.copyWith((message) => updates(message as Occurrence)) as Occurrence; $pb.BuilderInfo get info_ => _i; @@ -940,7 +1103,8 @@ class Occurrence extends $pb.GeneratedMessage { Occurrence createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Occurrence getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Occurrence getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static Occurrence? _defaultInstance; /// Source position of this occurrence. Must be exactly three or four @@ -969,7 +1133,10 @@ class Occurrence extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.String get symbol => $_getSZ(1); @$pb.TagNumber(2) - set symbol($core.String v) { $_setString(1, v); } + set symbol($core.String v) { + $_setString(1, v); + } + @$pb.TagNumber(2) $core.bool hasSymbol() => $_has(1); @$pb.TagNumber(2) @@ -980,7 +1147,10 @@ class Occurrence extends $pb.GeneratedMessage { @$pb.TagNumber(3) $core.int get symbolRoles => $_getIZ(2); @$pb.TagNumber(3) - set symbolRoles($core.int v) { $_setSignedInt32(2, v); } + set symbolRoles($core.int v) { + $_setSignedInt32(2, v); + } + @$pb.TagNumber(3) $core.bool hasSymbolRoles() => $_has(2); @$pb.TagNumber(3) @@ -1001,7 +1171,10 @@ class Occurrence extends $pb.GeneratedMessage { @$pb.TagNumber(5) SyntaxKind get syntaxKind => $_getN(4); @$pb.TagNumber(5) - set syntaxKind(SyntaxKind v) { setField(5, v); } + set syntaxKind(SyntaxKind v) { + setField(5, v); + } + @$pb.TagNumber(5) $core.bool hasSyntaxKind() => $_has(4); @$pb.TagNumber(5) @@ -1041,28 +1214,39 @@ class Diagnostic extends $pb.GeneratedMessage { return $result; } Diagnostic._() : super(); - factory Diagnostic.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Diagnostic.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Diagnostic', package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), createEmptyInstance: create) - ..e(1, _omitFieldNames ? '' : 'severity', $pb.PbFieldType.OE, defaultOrMaker: Severity.UnspecifiedSeverity, valueOf: Severity.valueOf, enumValues: Severity.values) + factory Diagnostic.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Diagnostic.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Diagnostic', + package: const $pb.PackageName(_omitMessageNames ? '' : 'scip'), + createEmptyInstance: create) + ..e(1, _omitFieldNames ? '' : 'severity', $pb.PbFieldType.OE, + defaultOrMaker: Severity.UnspecifiedSeverity, + valueOf: Severity.valueOf, + enumValues: Severity.values) ..aOS(2, _omitFieldNames ? '' : 'code') ..aOS(3, _omitFieldNames ? '' : 'message') ..aOS(4, _omitFieldNames ? '' : 'source') - ..pc(5, _omitFieldNames ? '' : 'tags', $pb.PbFieldType.KE, valueOf: DiagnosticTag.valueOf, enumValues: DiagnosticTag.values, defaultEnumValue: DiagnosticTag.UnspecifiedDiagnosticTag) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..pc(5, _omitFieldNames ? '' : 'tags', $pb.PbFieldType.KE, + valueOf: DiagnosticTag.valueOf, + enumValues: DiagnosticTag.values, + defaultEnumValue: DiagnosticTag.UnspecifiedDiagnosticTag) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Diagnostic clone() => Diagnostic()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Diagnostic copyWith(void Function(Diagnostic) updates) => super.copyWith((message) => updates(message as Diagnostic)) as Diagnostic; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Diagnostic copyWith(void Function(Diagnostic) updates) => + super.copyWith((message) => updates(message as Diagnostic)) as Diagnostic; $pb.BuilderInfo get info_ => _i; @@ -1071,14 +1255,18 @@ class Diagnostic extends $pb.GeneratedMessage { Diagnostic createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Diagnostic getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Diagnostic getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static Diagnostic? _defaultInstance; /// Should this diagnostic be reported as an error, warning, info, or hint? @$pb.TagNumber(1) Severity get severity => $_getN(0); @$pb.TagNumber(1) - set severity(Severity v) { setField(1, v); } + set severity(Severity v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasSeverity() => $_has(0); @$pb.TagNumber(1) @@ -1088,7 +1276,10 @@ class Diagnostic extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.String get code => $_getSZ(1); @$pb.TagNumber(2) - set code($core.String v) { $_setString(1, v); } + set code($core.String v) { + $_setString(1, v); + } + @$pb.TagNumber(2) $core.bool hasCode() => $_has(1); @$pb.TagNumber(2) @@ -1098,7 +1289,10 @@ class Diagnostic extends $pb.GeneratedMessage { @$pb.TagNumber(3) $core.String get message => $_getSZ(2); @$pb.TagNumber(3) - set message($core.String v) { $_setString(2, v); } + set message($core.String v) { + $_setString(2, v); + } + @$pb.TagNumber(3) $core.bool hasMessage() => $_has(2); @$pb.TagNumber(3) @@ -1109,7 +1303,10 @@ class Diagnostic extends $pb.GeneratedMessage { @$pb.TagNumber(4) $core.String get source => $_getSZ(3); @$pb.TagNumber(4) - set source($core.String v) { $_setString(3, v); } + set source($core.String v) { + $_setString(3, v); + } + @$pb.TagNumber(4) $core.bool hasSource() => $_has(3); @$pb.TagNumber(4) @@ -1119,6 +1316,6 @@ class Diagnostic extends $pb.GeneratedMessage { $core.List get tags => $_getList(4); } - const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const _omitMessageNames = + $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/lib/src/gen/scip.pbenum.dart b/lib/src/gen/scip.pbenum.dart index 811a5942..11a2bc69 100644 --- a/lib/src/gen/scip.pbenum.dart +++ b/lib/src/gen/scip.pbenum.dart @@ -14,30 +14,36 @@ import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; class ProtocolVersion extends $pb.ProtobufEnum { - static const ProtocolVersion UnspecifiedProtocolVersion = ProtocolVersion._(0, _omitEnumNames ? '' : 'UnspecifiedProtocolVersion'); + static const ProtocolVersion UnspecifiedProtocolVersion = + ProtocolVersion._(0, _omitEnumNames ? '' : 'UnspecifiedProtocolVersion'); - static const $core.List values = [ + static const $core.List values = [ UnspecifiedProtocolVersion, ]; - static final $core.Map<$core.int, ProtocolVersion> _byValue = $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, ProtocolVersion> _byValue = + $pb.ProtobufEnum.initByValue(values); static ProtocolVersion? valueOf($core.int value) => _byValue[value]; const ProtocolVersion._($core.int v, $core.String n) : super(v, n); } class TextEncoding extends $pb.ProtobufEnum { - static const TextEncoding UnspecifiedTextEncoding = TextEncoding._(0, _omitEnumNames ? '' : 'UnspecifiedTextEncoding'); - static const TextEncoding UTF8 = TextEncoding._(1, _omitEnumNames ? '' : 'UTF8'); - static const TextEncoding UTF16 = TextEncoding._(2, _omitEnumNames ? '' : 'UTF16'); - - static const $core.List values = [ + static const TextEncoding UnspecifiedTextEncoding = + TextEncoding._(0, _omitEnumNames ? '' : 'UnspecifiedTextEncoding'); + static const TextEncoding UTF8 = + TextEncoding._(1, _omitEnumNames ? '' : 'UTF8'); + static const TextEncoding UTF16 = + TextEncoding._(2, _omitEnumNames ? '' : 'UTF16'); + + static const $core.List values = [ UnspecifiedTextEncoding, UTF8, UTF16, ]; - static final $core.Map<$core.int, TextEncoding> _byValue = $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, TextEncoding> _byValue = + $pb.ProtobufEnum.initByValue(values); static TextEncoding? valueOf($core.int value) => _byValue[value]; const TextEncoding._($core.int v, $core.String n) : super(v, n); @@ -49,15 +55,21 @@ class TextEncoding extends $pb.ProtobufEnum { /// enum value is defined. In pseudocode, this can be implemented with the /// logic: `const isImportRole = (role.value & SymbolRole.Import.value) > 0`. class SymbolRole extends $pb.ProtobufEnum { - static const SymbolRole UnspecifiedSymbolRole = SymbolRole._(0, _omitEnumNames ? '' : 'UnspecifiedSymbolRole'); - static const SymbolRole Definition = SymbolRole._(1, _omitEnumNames ? '' : 'Definition'); - static const SymbolRole Import = SymbolRole._(2, _omitEnumNames ? '' : 'Import'); - static const SymbolRole WriteAccess = SymbolRole._(4, _omitEnumNames ? '' : 'WriteAccess'); - static const SymbolRole ReadAccess = SymbolRole._(8, _omitEnumNames ? '' : 'ReadAccess'); - static const SymbolRole Generated = SymbolRole._(16, _omitEnumNames ? '' : 'Generated'); + static const SymbolRole UnspecifiedSymbolRole = + SymbolRole._(0, _omitEnumNames ? '' : 'UnspecifiedSymbolRole'); + static const SymbolRole Definition = + SymbolRole._(1, _omitEnumNames ? '' : 'Definition'); + static const SymbolRole Import = + SymbolRole._(2, _omitEnumNames ? '' : 'Import'); + static const SymbolRole WriteAccess = + SymbolRole._(4, _omitEnumNames ? '' : 'WriteAccess'); + static const SymbolRole ReadAccess = + SymbolRole._(8, _omitEnumNames ? '' : 'ReadAccess'); + static const SymbolRole Generated = + SymbolRole._(16, _omitEnumNames ? '' : 'Generated'); static const SymbolRole Test = SymbolRole._(32, _omitEnumNames ? '' : 'Test'); - static const $core.List values = [ + static const $core.List values = [ UnspecifiedSymbolRole, Definition, Import, @@ -67,55 +79,92 @@ class SymbolRole extends $pb.ProtobufEnum { Test, ]; - static final $core.Map<$core.int, SymbolRole> _byValue = $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, SymbolRole> _byValue = + $pb.ProtobufEnum.initByValue(values); static SymbolRole? valueOf($core.int value) => _byValue[value]; const SymbolRole._($core.int v, $core.String n) : super(v, n); } class SyntaxKind extends $pb.ProtobufEnum { - static const SyntaxKind UnspecifiedSyntaxKind = SyntaxKind._(0, _omitEnumNames ? '' : 'UnspecifiedSyntaxKind'); - static const SyntaxKind Comment = SyntaxKind._(1, _omitEnumNames ? '' : 'Comment'); - static const SyntaxKind PunctuationDelimiter = SyntaxKind._(2, _omitEnumNames ? '' : 'PunctuationDelimiter'); - static const SyntaxKind PunctuationBracket = SyntaxKind._(3, _omitEnumNames ? '' : 'PunctuationBracket'); - static const SyntaxKind Keyword = SyntaxKind._(4, _omitEnumNames ? '' : 'Keyword'); - static const SyntaxKind IdentifierOperator = SyntaxKind._(5, _omitEnumNames ? '' : 'IdentifierOperator'); - static const SyntaxKind Identifier = SyntaxKind._(6, _omitEnumNames ? '' : 'Identifier'); - static const SyntaxKind IdentifierBuiltin = SyntaxKind._(7, _omitEnumNames ? '' : 'IdentifierBuiltin'); - static const SyntaxKind IdentifierNull = SyntaxKind._(8, _omitEnumNames ? '' : 'IdentifierNull'); - static const SyntaxKind IdentifierConstant = SyntaxKind._(9, _omitEnumNames ? '' : 'IdentifierConstant'); - static const SyntaxKind IdentifierMutableGlobal = SyntaxKind._(10, _omitEnumNames ? '' : 'IdentifierMutableGlobal'); - static const SyntaxKind IdentifierParameter = SyntaxKind._(11, _omitEnumNames ? '' : 'IdentifierParameter'); - static const SyntaxKind IdentifierLocal = SyntaxKind._(12, _omitEnumNames ? '' : 'IdentifierLocal'); - static const SyntaxKind IdentifierShadowed = SyntaxKind._(13, _omitEnumNames ? '' : 'IdentifierShadowed'); - static const SyntaxKind IdentifierNamespace = SyntaxKind._(14, _omitEnumNames ? '' : 'IdentifierNamespace'); - static const SyntaxKind IdentifierFunction = SyntaxKind._(15, _omitEnumNames ? '' : 'IdentifierFunction'); - static const SyntaxKind IdentifierFunctionDefinition = SyntaxKind._(16, _omitEnumNames ? '' : 'IdentifierFunctionDefinition'); - static const SyntaxKind IdentifierMacro = SyntaxKind._(17, _omitEnumNames ? '' : 'IdentifierMacro'); - static const SyntaxKind IdentifierMacroDefinition = SyntaxKind._(18, _omitEnumNames ? '' : 'IdentifierMacroDefinition'); - static const SyntaxKind IdentifierType = SyntaxKind._(19, _omitEnumNames ? '' : 'IdentifierType'); - static const SyntaxKind IdentifierBuiltinType = SyntaxKind._(20, _omitEnumNames ? '' : 'IdentifierBuiltinType'); - static const SyntaxKind IdentifierAttribute = SyntaxKind._(21, _omitEnumNames ? '' : 'IdentifierAttribute'); - static const SyntaxKind RegexEscape = SyntaxKind._(22, _omitEnumNames ? '' : 'RegexEscape'); - static const SyntaxKind RegexRepeated = SyntaxKind._(23, _omitEnumNames ? '' : 'RegexRepeated'); - static const SyntaxKind RegexWildcard = SyntaxKind._(24, _omitEnumNames ? '' : 'RegexWildcard'); - static const SyntaxKind RegexDelimiter = SyntaxKind._(25, _omitEnumNames ? '' : 'RegexDelimiter'); - static const SyntaxKind RegexJoin = SyntaxKind._(26, _omitEnumNames ? '' : 'RegexJoin'); - static const SyntaxKind StringLiteral = SyntaxKind._(27, _omitEnumNames ? '' : 'StringLiteral'); - static const SyntaxKind StringLiteralEscape = SyntaxKind._(28, _omitEnumNames ? '' : 'StringLiteralEscape'); - static const SyntaxKind StringLiteralSpecial = SyntaxKind._(29, _omitEnumNames ? '' : 'StringLiteralSpecial'); - static const SyntaxKind StringLiteralKey = SyntaxKind._(30, _omitEnumNames ? '' : 'StringLiteralKey'); - static const SyntaxKind CharacterLiteral = SyntaxKind._(31, _omitEnumNames ? '' : 'CharacterLiteral'); - static const SyntaxKind NumericLiteral = SyntaxKind._(32, _omitEnumNames ? '' : 'NumericLiteral'); - static const SyntaxKind BooleanLiteral = SyntaxKind._(33, _omitEnumNames ? '' : 'BooleanLiteral'); + static const SyntaxKind UnspecifiedSyntaxKind = + SyntaxKind._(0, _omitEnumNames ? '' : 'UnspecifiedSyntaxKind'); + static const SyntaxKind Comment = + SyntaxKind._(1, _omitEnumNames ? '' : 'Comment'); + static const SyntaxKind PunctuationDelimiter = + SyntaxKind._(2, _omitEnumNames ? '' : 'PunctuationDelimiter'); + static const SyntaxKind PunctuationBracket = + SyntaxKind._(3, _omitEnumNames ? '' : 'PunctuationBracket'); + static const SyntaxKind Keyword = + SyntaxKind._(4, _omitEnumNames ? '' : 'Keyword'); + static const SyntaxKind IdentifierOperator = + SyntaxKind._(5, _omitEnumNames ? '' : 'IdentifierOperator'); + static const SyntaxKind Identifier = + SyntaxKind._(6, _omitEnumNames ? '' : 'Identifier'); + static const SyntaxKind IdentifierBuiltin = + SyntaxKind._(7, _omitEnumNames ? '' : 'IdentifierBuiltin'); + static const SyntaxKind IdentifierNull = + SyntaxKind._(8, _omitEnumNames ? '' : 'IdentifierNull'); + static const SyntaxKind IdentifierConstant = + SyntaxKind._(9, _omitEnumNames ? '' : 'IdentifierConstant'); + static const SyntaxKind IdentifierMutableGlobal = + SyntaxKind._(10, _omitEnumNames ? '' : 'IdentifierMutableGlobal'); + static const SyntaxKind IdentifierParameter = + SyntaxKind._(11, _omitEnumNames ? '' : 'IdentifierParameter'); + static const SyntaxKind IdentifierLocal = + SyntaxKind._(12, _omitEnumNames ? '' : 'IdentifierLocal'); + static const SyntaxKind IdentifierShadowed = + SyntaxKind._(13, _omitEnumNames ? '' : 'IdentifierShadowed'); + static const SyntaxKind IdentifierNamespace = + SyntaxKind._(14, _omitEnumNames ? '' : 'IdentifierNamespace'); + static const SyntaxKind IdentifierFunction = + SyntaxKind._(15, _omitEnumNames ? '' : 'IdentifierFunction'); + static const SyntaxKind IdentifierFunctionDefinition = + SyntaxKind._(16, _omitEnumNames ? '' : 'IdentifierFunctionDefinition'); + static const SyntaxKind IdentifierMacro = + SyntaxKind._(17, _omitEnumNames ? '' : 'IdentifierMacro'); + static const SyntaxKind IdentifierMacroDefinition = + SyntaxKind._(18, _omitEnumNames ? '' : 'IdentifierMacroDefinition'); + static const SyntaxKind IdentifierType = + SyntaxKind._(19, _omitEnumNames ? '' : 'IdentifierType'); + static const SyntaxKind IdentifierBuiltinType = + SyntaxKind._(20, _omitEnumNames ? '' : 'IdentifierBuiltinType'); + static const SyntaxKind IdentifierAttribute = + SyntaxKind._(21, _omitEnumNames ? '' : 'IdentifierAttribute'); + static const SyntaxKind RegexEscape = + SyntaxKind._(22, _omitEnumNames ? '' : 'RegexEscape'); + static const SyntaxKind RegexRepeated = + SyntaxKind._(23, _omitEnumNames ? '' : 'RegexRepeated'); + static const SyntaxKind RegexWildcard = + SyntaxKind._(24, _omitEnumNames ? '' : 'RegexWildcard'); + static const SyntaxKind RegexDelimiter = + SyntaxKind._(25, _omitEnumNames ? '' : 'RegexDelimiter'); + static const SyntaxKind RegexJoin = + SyntaxKind._(26, _omitEnumNames ? '' : 'RegexJoin'); + static const SyntaxKind StringLiteral = + SyntaxKind._(27, _omitEnumNames ? '' : 'StringLiteral'); + static const SyntaxKind StringLiteralEscape = + SyntaxKind._(28, _omitEnumNames ? '' : 'StringLiteralEscape'); + static const SyntaxKind StringLiteralSpecial = + SyntaxKind._(29, _omitEnumNames ? '' : 'StringLiteralSpecial'); + static const SyntaxKind StringLiteralKey = + SyntaxKind._(30, _omitEnumNames ? '' : 'StringLiteralKey'); + static const SyntaxKind CharacterLiteral = + SyntaxKind._(31, _omitEnumNames ? '' : 'CharacterLiteral'); + static const SyntaxKind NumericLiteral = + SyntaxKind._(32, _omitEnumNames ? '' : 'NumericLiteral'); + static const SyntaxKind BooleanLiteral = + SyntaxKind._(33, _omitEnumNames ? '' : 'BooleanLiteral'); static const SyntaxKind Tag = SyntaxKind._(34, _omitEnumNames ? '' : 'Tag'); - static const SyntaxKind TagAttribute = SyntaxKind._(35, _omitEnumNames ? '' : 'TagAttribute'); - static const SyntaxKind TagDelimiter = SyntaxKind._(36, _omitEnumNames ? '' : 'TagDelimiter'); + static const SyntaxKind TagAttribute = + SyntaxKind._(35, _omitEnumNames ? '' : 'TagAttribute'); + static const SyntaxKind TagDelimiter = + SyntaxKind._(36, _omitEnumNames ? '' : 'TagDelimiter'); static const SyntaxKind IdentifierKeyword = Keyword; static const SyntaxKind IdentifierModule = IdentifierNamespace; - static const $core.List values = [ + static const $core.List values = [ UnspecifiedSyntaxKind, Comment, PunctuationDelimiter, @@ -155,20 +204,24 @@ class SyntaxKind extends $pb.ProtobufEnum { TagDelimiter, ]; - static final $core.Map<$core.int, SyntaxKind> _byValue = $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, SyntaxKind> _byValue = + $pb.ProtobufEnum.initByValue(values); static SyntaxKind? valueOf($core.int value) => _byValue[value]; const SyntaxKind._($core.int v, $core.String n) : super(v, n); } class Severity extends $pb.ProtobufEnum { - static const Severity UnspecifiedSeverity = Severity._(0, _omitEnumNames ? '' : 'UnspecifiedSeverity'); + static const Severity UnspecifiedSeverity = + Severity._(0, _omitEnumNames ? '' : 'UnspecifiedSeverity'); static const Severity Error = Severity._(1, _omitEnumNames ? '' : 'Error'); - static const Severity Warning = Severity._(2, _omitEnumNames ? '' : 'Warning'); - static const Severity Information = Severity._(3, _omitEnumNames ? '' : 'Information'); + static const Severity Warning = + Severity._(2, _omitEnumNames ? '' : 'Warning'); + static const Severity Information = + Severity._(3, _omitEnumNames ? '' : 'Information'); static const Severity Hint = Severity._(4, _omitEnumNames ? '' : 'Hint'); - static const $core.List values = [ + static const $core.List values = [ UnspecifiedSeverity, Error, Warning, @@ -176,24 +229,29 @@ class Severity extends $pb.ProtobufEnum { Hint, ]; - static final $core.Map<$core.int, Severity> _byValue = $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, Severity> _byValue = + $pb.ProtobufEnum.initByValue(values); static Severity? valueOf($core.int value) => _byValue[value]; const Severity._($core.int v, $core.String n) : super(v, n); } class DiagnosticTag extends $pb.ProtobufEnum { - static const DiagnosticTag UnspecifiedDiagnosticTag = DiagnosticTag._(0, _omitEnumNames ? '' : 'UnspecifiedDiagnosticTag'); - static const DiagnosticTag Unnecessary = DiagnosticTag._(1, _omitEnumNames ? '' : 'Unnecessary'); - static const DiagnosticTag Deprecated = DiagnosticTag._(2, _omitEnumNames ? '' : 'Deprecated'); - - static const $core.List values = [ + static const DiagnosticTag UnspecifiedDiagnosticTag = + DiagnosticTag._(0, _omitEnumNames ? '' : 'UnspecifiedDiagnosticTag'); + static const DiagnosticTag Unnecessary = + DiagnosticTag._(1, _omitEnumNames ? '' : 'Unnecessary'); + static const DiagnosticTag Deprecated = + DiagnosticTag._(2, _omitEnumNames ? '' : 'Deprecated'); + + static const $core.List values = [ UnspecifiedDiagnosticTag, Unnecessary, Deprecated, ]; - static final $core.Map<$core.int, DiagnosticTag> _byValue = $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, DiagnosticTag> _byValue = + $pb.ProtobufEnum.initByValue(values); static DiagnosticTag? valueOf($core.int value) => _byValue[value]; const DiagnosticTag._($core.int v, $core.String n) : super(v, n); @@ -206,13 +264,16 @@ class DiagnosticTag extends $pb.ProtobufEnum { /// "CPlusPlus" in this enum and other names such as "cpp" are incompatible. /// Feel free to send a pull-request to add missing programming languages. class Language extends $pb.ProtobufEnum { - static const Language UnspecifiedLanguage = Language._(0, _omitEnumNames ? '' : 'UnspecifiedLanguage'); + static const Language UnspecifiedLanguage = + Language._(0, _omitEnumNames ? '' : 'UnspecifiedLanguage'); static const Language ABAP = Language._(60, _omitEnumNames ? '' : 'ABAP'); static const Language APL = Language._(49, _omitEnumNames ? '' : 'APL'); static const Language Ada = Language._(39, _omitEnumNames ? '' : 'Ada'); static const Language Agda = Language._(45, _omitEnumNames ? '' : 'Agda'); - static const Language AsciiDoc = Language._(86, _omitEnumNames ? '' : 'AsciiDoc'); - static const Language Assembly = Language._(58, _omitEnumNames ? '' : 'Assembly'); + static const Language AsciiDoc = + Language._(86, _omitEnumNames ? '' : 'AsciiDoc'); + static const Language Assembly = + Language._(58, _omitEnumNames ? '' : 'Assembly'); static const Language Awk = Language._(66, _omitEnumNames ? '' : 'Awk'); static const Language Bat = Language._(68, _omitEnumNames ? '' : 'Bat'); static const Language BibTeX = Language._(81, _omitEnumNames ? '' : 'BibTeX'); @@ -221,55 +282,73 @@ class Language extends $pb.ProtobufEnum { static const Language CPP = Language._(35, _omitEnumNames ? '' : 'CPP'); static const Language CSS = Language._(26, _omitEnumNames ? '' : 'CSS'); static const Language CSharp = Language._(1, _omitEnumNames ? '' : 'CSharp'); - static const Language Clojure = Language._(8, _omitEnumNames ? '' : 'Clojure'); - static const Language Coffeescript = Language._(21, _omitEnumNames ? '' : 'Coffeescript'); - static const Language CommonLisp = Language._(9, _omitEnumNames ? '' : 'CommonLisp'); + static const Language Clojure = + Language._(8, _omitEnumNames ? '' : 'Clojure'); + static const Language Coffeescript = + Language._(21, _omitEnumNames ? '' : 'Coffeescript'); + static const Language CommonLisp = + Language._(9, _omitEnumNames ? '' : 'CommonLisp'); static const Language Coq = Language._(47, _omitEnumNames ? '' : 'Coq'); static const Language Dart = Language._(3, _omitEnumNames ? '' : 'Dart'); static const Language Delphi = Language._(57, _omitEnumNames ? '' : 'Delphi'); static const Language Diff = Language._(88, _omitEnumNames ? '' : 'Diff'); - static const Language Dockerfile = Language._(80, _omitEnumNames ? '' : 'Dockerfile'); + static const Language Dockerfile = + Language._(80, _omitEnumNames ? '' : 'Dockerfile'); static const Language Dyalog = Language._(50, _omitEnumNames ? '' : 'Dyalog'); static const Language Elixir = Language._(17, _omitEnumNames ? '' : 'Elixir'); static const Language Erlang = Language._(18, _omitEnumNames ? '' : 'Erlang'); static const Language FSharp = Language._(42, _omitEnumNames ? '' : 'FSharp'); static const Language Fish = Language._(65, _omitEnumNames ? '' : 'Fish'); static const Language Flow = Language._(24, _omitEnumNames ? '' : 'Flow'); - static const Language Fortran = Language._(56, _omitEnumNames ? '' : 'Fortran'); - static const Language Git_Commit = Language._(91, _omitEnumNames ? '' : 'Git_Commit'); - static const Language Git_Config = Language._(89, _omitEnumNames ? '' : 'Git_Config'); - static const Language Git_Rebase = Language._(92, _omitEnumNames ? '' : 'Git_Rebase'); + static const Language Fortran = + Language._(56, _omitEnumNames ? '' : 'Fortran'); + static const Language Git_Commit = + Language._(91, _omitEnumNames ? '' : 'Git_Commit'); + static const Language Git_Config = + Language._(89, _omitEnumNames ? '' : 'Git_Config'); + static const Language Git_Rebase = + Language._(92, _omitEnumNames ? '' : 'Git_Rebase'); static const Language Go = Language._(33, _omitEnumNames ? '' : 'Go'); static const Language Groovy = Language._(7, _omitEnumNames ? '' : 'Groovy'); static const Language HTML = Language._(30, _omitEnumNames ? '' : 'HTML'); static const Language Hack = Language._(20, _omitEnumNames ? '' : 'Hack'); - static const Language Handlebars = Language._(90, _omitEnumNames ? '' : 'Handlebars'); - static const Language Haskell = Language._(44, _omitEnumNames ? '' : 'Haskell'); + static const Language Handlebars = + Language._(90, _omitEnumNames ? '' : 'Handlebars'); + static const Language Haskell = + Language._(44, _omitEnumNames ? '' : 'Haskell'); static const Language Idris = Language._(46, _omitEnumNames ? '' : 'Idris'); static const Language Ini = Language._(72, _omitEnumNames ? '' : 'Ini'); static const Language J = Language._(51, _omitEnumNames ? '' : 'J'); static const Language JSON = Language._(75, _omitEnumNames ? '' : 'JSON'); static const Language Java = Language._(6, _omitEnumNames ? '' : 'Java'); - static const Language JavaScript = Language._(22, _omitEnumNames ? '' : 'JavaScript'); - static const Language JavaScriptReact = Language._(93, _omitEnumNames ? '' : 'JavaScriptReact'); - static const Language Jsonnet = Language._(76, _omitEnumNames ? '' : 'Jsonnet'); + static const Language JavaScript = + Language._(22, _omitEnumNames ? '' : 'JavaScript'); + static const Language JavaScriptReact = + Language._(93, _omitEnumNames ? '' : 'JavaScriptReact'); + static const Language Jsonnet = + Language._(76, _omitEnumNames ? '' : 'Jsonnet'); static const Language Julia = Language._(55, _omitEnumNames ? '' : 'Julia'); static const Language Kotlin = Language._(4, _omitEnumNames ? '' : 'Kotlin'); static const Language LaTeX = Language._(83, _omitEnumNames ? '' : 'LaTeX'); static const Language Lean = Language._(48, _omitEnumNames ? '' : 'Lean'); static const Language Less = Language._(27, _omitEnumNames ? '' : 'Less'); static const Language Lua = Language._(12, _omitEnumNames ? '' : 'Lua'); - static const Language Makefile = Language._(79, _omitEnumNames ? '' : 'Makefile'); - static const Language Markdown = Language._(84, _omitEnumNames ? '' : 'Markdown'); + static const Language Makefile = + Language._(79, _omitEnumNames ? '' : 'Makefile'); + static const Language Markdown = + Language._(84, _omitEnumNames ? '' : 'Markdown'); static const Language Matlab = Language._(52, _omitEnumNames ? '' : 'Matlab'); static const Language Nix = Language._(77, _omitEnumNames ? '' : 'Nix'); static const Language OCaml = Language._(41, _omitEnumNames ? '' : 'OCaml'); - static const Language Objective_C = Language._(36, _omitEnumNames ? '' : 'Objective_C'); - static const Language Objective_CPP = Language._(37, _omitEnumNames ? '' : 'Objective_CPP'); + static const Language Objective_C = + Language._(36, _omitEnumNames ? '' : 'Objective_C'); + static const Language Objective_CPP = + Language._(37, _omitEnumNames ? '' : 'Objective_CPP'); static const Language PHP = Language._(19, _omitEnumNames ? '' : 'PHP'); static const Language PLSQL = Language._(70, _omitEnumNames ? '' : 'PLSQL'); static const Language Perl = Language._(13, _omitEnumNames ? '' : 'Perl'); - static const Language PowerShell = Language._(67, _omitEnumNames ? '' : 'PowerShell'); + static const Language PowerShell = + Language._(67, _omitEnumNames ? '' : 'PowerShell'); static const Language Prolog = Language._(71, _omitEnumNames ? '' : 'Prolog'); static const Language Python = Language._(15, _omitEnumNames ? '' : 'Python'); static const Language R = Language._(54, _omitEnumNames ? '' : 'R'); @@ -286,22 +365,28 @@ class Language extends $pb.ProtobufEnum { static const Language Sass = Language._(28, _omitEnumNames ? '' : 'Sass'); static const Language Scala = Language._(5, _omitEnumNames ? '' : 'Scala'); static const Language Scheme = Language._(10, _omitEnumNames ? '' : 'Scheme'); - static const Language ShellScript = Language._(64, _omitEnumNames ? '' : 'ShellScript'); - static const Language Skylark = Language._(78, _omitEnumNames ? '' : 'Skylark'); + static const Language ShellScript = + Language._(64, _omitEnumNames ? '' : 'ShellScript'); + static const Language Skylark = + Language._(78, _omitEnumNames ? '' : 'Skylark'); static const Language Swift = Language._(2, _omitEnumNames ? '' : 'Swift'); static const Language TOML = Language._(73, _omitEnumNames ? '' : 'TOML'); static const Language TeX = Language._(82, _omitEnumNames ? '' : 'TeX'); - static const Language TypeScript = Language._(23, _omitEnumNames ? '' : 'TypeScript'); - static const Language TypeScriptReact = Language._(94, _omitEnumNames ? '' : 'TypeScriptReact'); - static const Language VisualBasic = Language._(63, _omitEnumNames ? '' : 'VisualBasic'); + static const Language TypeScript = + Language._(23, _omitEnumNames ? '' : 'TypeScript'); + static const Language TypeScriptReact = + Language._(94, _omitEnumNames ? '' : 'TypeScriptReact'); + static const Language VisualBasic = + Language._(63, _omitEnumNames ? '' : 'VisualBasic'); static const Language Vue = Language._(25, _omitEnumNames ? '' : 'Vue'); - static const Language Wolfram = Language._(53, _omitEnumNames ? '' : 'Wolfram'); + static const Language Wolfram = + Language._(53, _omitEnumNames ? '' : 'Wolfram'); static const Language XML = Language._(31, _omitEnumNames ? '' : 'XML'); static const Language XSL = Language._(32, _omitEnumNames ? '' : 'XSL'); static const Language YAML = Language._(74, _omitEnumNames ? '' : 'YAML'); static const Language Zig = Language._(38, _omitEnumNames ? '' : 'Zig'); - static const $core.List values = [ + static const $core.List values = [ UnspecifiedLanguage, ABAP, APL, @@ -398,27 +483,38 @@ class Language extends $pb.ProtobufEnum { Zig, ]; - static final $core.Map<$core.int, Language> _byValue = $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, Language> _byValue = + $pb.ProtobufEnum.initByValue(values); static Language? valueOf($core.int value) => _byValue[value]; const Language._($core.int v, $core.String n) : super(v, n); } class Descriptor_Suffix extends $pb.ProtobufEnum { - static const Descriptor_Suffix UnspecifiedSuffix = Descriptor_Suffix._(0, _omitEnumNames ? '' : 'UnspecifiedSuffix'); - static const Descriptor_Suffix Namespace = Descriptor_Suffix._(1, _omitEnumNames ? '' : 'Namespace'); - static const Descriptor_Suffix Type = Descriptor_Suffix._(2, _omitEnumNames ? '' : 'Type'); - static const Descriptor_Suffix Term = Descriptor_Suffix._(3, _omitEnumNames ? '' : 'Term'); - static const Descriptor_Suffix Method = Descriptor_Suffix._(4, _omitEnumNames ? '' : 'Method'); - static const Descriptor_Suffix TypeParameter = Descriptor_Suffix._(5, _omitEnumNames ? '' : 'TypeParameter'); - static const Descriptor_Suffix Parameter = Descriptor_Suffix._(6, _omitEnumNames ? '' : 'Parameter'); - static const Descriptor_Suffix Macro = Descriptor_Suffix._(9, _omitEnumNames ? '' : 'Macro'); - static const Descriptor_Suffix Meta = Descriptor_Suffix._(7, _omitEnumNames ? '' : 'Meta'); - static const Descriptor_Suffix Local = Descriptor_Suffix._(8, _omitEnumNames ? '' : 'Local'); + static const Descriptor_Suffix UnspecifiedSuffix = + Descriptor_Suffix._(0, _omitEnumNames ? '' : 'UnspecifiedSuffix'); + static const Descriptor_Suffix Namespace = + Descriptor_Suffix._(1, _omitEnumNames ? '' : 'Namespace'); + static const Descriptor_Suffix Type = + Descriptor_Suffix._(2, _omitEnumNames ? '' : 'Type'); + static const Descriptor_Suffix Term = + Descriptor_Suffix._(3, _omitEnumNames ? '' : 'Term'); + static const Descriptor_Suffix Method = + Descriptor_Suffix._(4, _omitEnumNames ? '' : 'Method'); + static const Descriptor_Suffix TypeParameter = + Descriptor_Suffix._(5, _omitEnumNames ? '' : 'TypeParameter'); + static const Descriptor_Suffix Parameter = + Descriptor_Suffix._(6, _omitEnumNames ? '' : 'Parameter'); + static const Descriptor_Suffix Macro = + Descriptor_Suffix._(9, _omitEnumNames ? '' : 'Macro'); + static const Descriptor_Suffix Meta = + Descriptor_Suffix._(7, _omitEnumNames ? '' : 'Meta'); + static const Descriptor_Suffix Local = + Descriptor_Suffix._(8, _omitEnumNames ? '' : 'Local'); static const Descriptor_Suffix Package = Namespace; - static const $core.List values = [ + static const $core.List values = [ UnspecifiedSuffix, Namespace, Type, @@ -431,11 +527,11 @@ class Descriptor_Suffix extends $pb.ProtobufEnum { Local, ]; - static final $core.Map<$core.int, Descriptor_Suffix> _byValue = $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, Descriptor_Suffix> _byValue = + $pb.ProtobufEnum.initByValue(values); static Descriptor_Suffix? valueOf($core.int value) => _byValue[value]; const Descriptor_Suffix._($core.int v, $core.String n) : super(v, n); } - const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); diff --git a/lib/src/gen/scip.pbjson.dart b/lib/src/gen/scip.pbjson.dart index 104b13bb..8279ee27 100644 --- a/lib/src/gen/scip.pbjson.dart +++ b/lib/src/gen/scip.pbjson.dart @@ -295,9 +295,30 @@ final $typed_data.Uint8List languageDescriptor = $convert.base64Decode( const Index$json = { '1': 'Index', '2': [ - {'1': 'metadata', '3': 1, '4': 1, '5': 11, '6': '.scip.Metadata', '10': 'metadata'}, - {'1': 'documents', '3': 2, '4': 3, '5': 11, '6': '.scip.Document', '10': 'documents'}, - {'1': 'external_symbols', '3': 3, '4': 3, '5': 11, '6': '.scip.SymbolInformation', '10': 'externalSymbols'}, + { + '1': 'metadata', + '3': 1, + '4': 1, + '5': 11, + '6': '.scip.Metadata', + '10': 'metadata' + }, + { + '1': 'documents', + '3': 2, + '4': 3, + '5': 11, + '6': '.scip.Document', + '10': 'documents' + }, + { + '1': 'external_symbols', + '3': 3, + '4': 3, + '5': 11, + '6': '.scip.SymbolInformation', + '10': 'externalSymbols' + }, ], }; @@ -311,10 +332,31 @@ final $typed_data.Uint8List indexDescriptor = $convert.base64Decode( const Metadata$json = { '1': 'Metadata', '2': [ - {'1': 'version', '3': 1, '4': 1, '5': 14, '6': '.scip.ProtocolVersion', '10': 'version'}, - {'1': 'tool_info', '3': 2, '4': 1, '5': 11, '6': '.scip.ToolInfo', '10': 'toolInfo'}, + { + '1': 'version', + '3': 1, + '4': 1, + '5': 14, + '6': '.scip.ProtocolVersion', + '10': 'version' + }, + { + '1': 'tool_info', + '3': 2, + '4': 1, + '5': 11, + '6': '.scip.ToolInfo', + '10': 'toolInfo' + }, {'1': 'project_root', '3': 3, '4': 1, '5': 9, '10': 'projectRoot'}, - {'1': 'text_document_encoding', '3': 4, '4': 1, '5': 14, '6': '.scip.TextEncoding', '10': 'textDocumentEncoding'}, + { + '1': 'text_document_encoding', + '3': 4, + '4': 1, + '5': 14, + '6': '.scip.TextEncoding', + '10': 'textDocumentEncoding' + }, ], }; @@ -346,8 +388,22 @@ const Document$json = { '2': [ {'1': 'language', '3': 4, '4': 1, '5': 9, '10': 'language'}, {'1': 'relative_path', '3': 1, '4': 1, '5': 9, '10': 'relativePath'}, - {'1': 'occurrences', '3': 2, '4': 3, '5': 11, '6': '.scip.Occurrence', '10': 'occurrences'}, - {'1': 'symbols', '3': 3, '4': 3, '5': 11, '6': '.scip.SymbolInformation', '10': 'symbols'}, + { + '1': 'occurrences', + '3': 2, + '4': 3, + '5': 11, + '6': '.scip.Occurrence', + '10': 'occurrences' + }, + { + '1': 'symbols', + '3': 3, + '4': 3, + '5': 11, + '6': '.scip.SymbolInformation', + '10': 'symbols' + }, ], }; @@ -363,8 +419,22 @@ const Symbol$json = { '1': 'Symbol', '2': [ {'1': 'scheme', '3': 1, '4': 1, '5': 9, '10': 'scheme'}, - {'1': 'package', '3': 2, '4': 1, '5': 11, '6': '.scip.Package', '10': 'package'}, - {'1': 'descriptors', '3': 3, '4': 3, '5': 11, '6': '.scip.Descriptor', '10': 'descriptors'}, + { + '1': 'package', + '3': 2, + '4': 1, + '5': 11, + '6': '.scip.Package', + '10': 'package' + }, + { + '1': 'descriptors', + '3': 3, + '4': 3, + '5': 11, + '6': '.scip.Descriptor', + '10': 'descriptors' + }, ], }; @@ -395,7 +465,14 @@ const Descriptor$json = { '2': [ {'1': 'name', '3': 1, '4': 1, '5': 9, '10': 'name'}, {'1': 'disambiguator', '3': 2, '4': 1, '5': 9, '10': 'disambiguator'}, - {'1': 'suffix', '3': 3, '4': 1, '5': 14, '6': '.scip.Descriptor.Suffix', '10': 'suffix'}, + { + '1': 'suffix', + '3': 3, + '4': 1, + '5': 14, + '6': '.scip.Descriptor.Suffix', + '10': 'suffix' + }, ], '4': [Descriptor_Suffix$json], }; @@ -438,7 +515,14 @@ const SymbolInformation$json = { '2': [ {'1': 'symbol', '3': 1, '4': 1, '5': 9, '10': 'symbol'}, {'1': 'documentation', '3': 3, '4': 3, '5': 9, '10': 'documentation'}, - {'1': 'relationships', '3': 4, '4': 3, '5': 11, '6': '.scip.Relationship', '10': 'relationships'}, + { + '1': 'relationships', + '3': 4, + '4': 3, + '5': 11, + '6': '.scip.Relationship', + '10': 'relationships' + }, ], }; @@ -454,8 +538,20 @@ const Relationship$json = { '2': [ {'1': 'symbol', '3': 1, '4': 1, '5': 9, '10': 'symbol'}, {'1': 'is_reference', '3': 2, '4': 1, '5': 8, '10': 'isReference'}, - {'1': 'is_implementation', '3': 3, '4': 1, '5': 8, '10': 'isImplementation'}, - {'1': 'is_type_definition', '3': 4, '4': 1, '5': 8, '10': 'isTypeDefinition'}, + { + '1': 'is_implementation', + '3': 3, + '4': 1, + '5': 8, + '10': 'isImplementation' + }, + { + '1': 'is_type_definition', + '3': 4, + '4': 1, + '5': 8, + '10': 'isTypeDefinition' + }, {'1': 'is_definition', '3': 5, '4': 1, '5': 8, '10': 'isDefinition'}, ], }; @@ -474,9 +570,29 @@ const Occurrence$json = { {'1': 'range', '3': 1, '4': 3, '5': 5, '10': 'range'}, {'1': 'symbol', '3': 2, '4': 1, '5': 9, '10': 'symbol'}, {'1': 'symbol_roles', '3': 3, '4': 1, '5': 5, '10': 'symbolRoles'}, - {'1': 'override_documentation', '3': 4, '4': 3, '5': 9, '10': 'overrideDocumentation'}, - {'1': 'syntax_kind', '3': 5, '4': 1, '5': 14, '6': '.scip.SyntaxKind', '10': 'syntaxKind'}, - {'1': 'diagnostics', '3': 6, '4': 3, '5': 11, '6': '.scip.Diagnostic', '10': 'diagnostics'}, + { + '1': 'override_documentation', + '3': 4, + '4': 3, + '5': 9, + '10': 'overrideDocumentation' + }, + { + '1': 'syntax_kind', + '3': 5, + '4': 1, + '5': 14, + '6': '.scip.SyntaxKind', + '10': 'syntaxKind' + }, + { + '1': 'diagnostics', + '3': 6, + '4': 3, + '5': 11, + '6': '.scip.Diagnostic', + '10': 'diagnostics' + }, ], }; @@ -492,11 +608,25 @@ final $typed_data.Uint8List occurrenceDescriptor = $convert.base64Decode( const Diagnostic$json = { '1': 'Diagnostic', '2': [ - {'1': 'severity', '3': 1, '4': 1, '5': 14, '6': '.scip.Severity', '10': 'severity'}, + { + '1': 'severity', + '3': 1, + '4': 1, + '5': 14, + '6': '.scip.Severity', + '10': 'severity' + }, {'1': 'code', '3': 2, '4': 1, '5': 9, '10': 'code'}, {'1': 'message', '3': 3, '4': 1, '5': 9, '10': 'message'}, {'1': 'source', '3': 4, '4': 1, '5': 9, '10': 'source'}, - {'1': 'tags', '3': 5, '4': 3, '5': 14, '6': '.scip.DiagnosticTag', '10': 'tags'}, + { + '1': 'tags', + '3': 5, + '4': 3, + '5': 14, + '6': '.scip.DiagnosticTag', + '10': 'tags' + }, ], }; @@ -506,4 +636,3 @@ final $typed_data.Uint8List diagnosticDescriptor = $convert.base64Decode( 'kSEgoEY29kZRgCIAEoCVIEY29kZRIYCgdtZXNzYWdlGAMgASgJUgdtZXNzYWdlEhYKBnNvdXJj' 'ZRgEIAEoCVIGc291cmNlEicKBHRhZ3MYBSADKA4yEy5zY2lwLkRpYWdub3N0aWNUYWdSBHRhZ3' 'M='); - diff --git a/lib/src/gen/scip.pbserver.dart b/lib/src/gen/scip.pbserver.dart index cfbeb5df..5383fecc 100644 --- a/lib/src/gen/scip.pbserver.dart +++ b/lib/src/gen/scip.pbserver.dart @@ -11,4 +11,3 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'scip.pb.dart'; - diff --git a/snapshots/input/basic-project/lib/main.dart b/snapshots/input/basic-project/lib/main.dart index cbb519c9..2277304d 100644 --- a/snapshots/input/basic-project/lib/main.dart +++ b/snapshots/input/basic-project/lib/main.dart @@ -44,4 +44,4 @@ class SomeLocalClass {} /// Missing Reference: [IDontExist] void someFunction(int value) { Foo(1); -} \ No newline at end of file +} diff --git a/snapshots/input/basic-project/lib/more.dart b/snapshots/input/basic-project/lib/more.dart index 7b57fcde..114dbed7 100644 --- a/snapshots/input/basic-project/lib/more.dart +++ b/snapshots/input/basic-project/lib/more.dart @@ -66,10 +66,10 @@ void main() { print(dog); print('The sum of $numbers is $sum'); - print(math.Rectangle(1,2,3,4)); + print(math.Rectangle(1, 2, 3, 4)); - [1,2].reduce((a, b) => a + b); + [1, 2].reduce((a, b) => a + b); } void test(String Function(int) p) {} -void deepTest(String Function(void Function(String test)) p) {} \ No newline at end of file +void deepTest(String Function(void Function(String test)) p) {} diff --git a/snapshots/input/basic-project/lib/other.dart b/snapshots/input/basic-project/lib/other.dart index fb31e52b..6b2373c2 100644 --- a/snapshots/input/basic-project/lib/other.dart +++ b/snapshots/input/basic-project/lib/other.dart @@ -16,7 +16,5 @@ class Bar { } void main() { - more.loadLibrary().then((_) => { - Bar('a').someMethod.call() - }); -} \ No newline at end of file + more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); +} diff --git a/snapshots/input/basic-project/test/basic_test.dart b/snapshots/input/basic-project/test/basic_test.dart index 35ddd9ba..cda44fb2 100644 --- a/snapshots/input/basic-project/test/basic_test.dart +++ b/snapshots/input/basic-project/test/basic_test.dart @@ -6,4 +6,4 @@ void main() { expect(1, 1); }); }); -} \ No newline at end of file +} diff --git a/snapshots/input/dart3-features/lib/main.dart b/snapshots/input/dart3-features/lib/main.dart index f8c5d472..67338643 100644 --- a/snapshots/input/dart3-features/lib/main.dart +++ b/snapshots/input/dart3-features/lib/main.dart @@ -37,9 +37,9 @@ const msg = 'Feeling the Monday blues?'; String describeDate(DateTime dt) { const one = 1; return switch (dt.weekday) { - one => 'Feeling the Monday blues?', - 7 || six => 'Enjoy the weekend!', - _ => 'Hang in there.' + one => 'Feeling the Monday blues?', + 7 || six => 'Enjoy the weekend!', + _ => 'Hang in there.' }; } @@ -50,7 +50,6 @@ void main() { ) = userInfo({'name': 'Michael', 'height': 180}); print('User $name is $height cm tall.'); - final json = {'name': 'Michael', 'height': 180}; if (json case {'name': 'Michael', 'height': int h}) { print('Michael is $h cm tall.'); @@ -58,6 +57,9 @@ void main() { } base class Foo {} + final class Bar {} + interface class Car {} -sealed class Zar {} \ No newline at end of file + +sealed class Zar {} diff --git a/snapshots/input/relationships-project/lib/main.dart b/snapshots/input/relationships-project/lib/main.dart index bd028ee2..39b7f2da 100644 --- a/snapshots/input/relationships-project/lib/main.dart +++ b/snapshots/input/relationships-project/lib/main.dart @@ -16,4 +16,4 @@ class Dog extends Animal with SwimAction { @override String get hierarchy => 'dog.animal.mammal'; -} \ No newline at end of file +} diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index d90b5b2e..79cb6cef 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -1,11 +1,11 @@ - import 'package:dart_test/other.dart'; +import 'package:dart_test/other.dart'; // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ - - /// This is a fib function - /// - /// Takes a number - /// Returns a number - int fib(int n) { + +/// This is a fib function +/// +/// Takes a number +/// Returns a number +int fib(int n) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // documentation ```dart @@ -13,95 +13,95 @@ // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart - if (n <= 1) return 0; + if (n <= 1) return 0; // ^ reference local 0 - return fib(n - 1) + fib(n - 2); + return fib(n - 1) + fib(n - 2); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 - } - - void print_fib(int a) { +} + +void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart - print(fib(a)); + print(fib(a)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 1 - } - - final y = 'Hello'; +} + +final y = 'Hello'; // ^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/y. // documentation ```dart - String capture() { +String capture() { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart - return y; + return y; // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. - } - - final capture_lambda = () => y; +} + +final capture_lambda = () => y; // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture_lambda. // documentation ```dart // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. - - void main() { + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/main(). // documentation ```dart - for (var i = 0; i <= 10; i++) {} + for (var i = 0; i <= 10; i++) {} // ^ definition local 2 // documentation ```dart // ^ reference local 2 // ^ reference local 2 - - for (var i in [1, 2, 3]) { + + for (var i in [1, 2, 3]) { // ^ definition local 3 // documentation ```dart - print(i); + print(i); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 3 - } - - var a = 0; + } + + var a = 0; // ^ definition local 4 // documentation ```dart - a = 1; + a = 1; // ^ reference local 4 - print_fib(a); + print_fib(a); // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // ^ reference local 4 - } - - void forever() { +} + +void forever() { // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). // documentation ```dart - return forever(); + return forever(); // ^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). - } - - class SomeLocalClass {} +} + +class SomeLocalClass {} // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# // documentation ```dart - - /// Reference parameter: [value] + +/// Reference parameter: [value] // ^^^^^ reference local 5 - /// Reference class: [SomeLocalClass] +/// Reference class: [SomeLocalClass] // ^^^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# - /// Reference external class: [Foo] +/// Reference external class: [Foo] // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# - /// Missing Reference: [IDontExist] - void someFunction(int value) { +/// Missing Reference: [IDontExist] +void someFunction(int value) { // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/someFunction(). // documentation ```dart // documentation Reference parameter: [value] // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^ definition local 5 // documentation ```dart - Foo(1); + Foo(1); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# - } +} diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index 87014909..23daa1f3 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -1,54 +1,54 @@ - import 'dart:math' as math; +import 'dart:math' as math; // definition scip-dart pub dart_test 1.0.0 lib/more.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/math. // documentation ```dart - - enum AnimalType { + +enum AnimalType { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // documentation ```dart - cat, + cat, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. // documentation ```dart - dog, + dog, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. // documentation ```dart - bird, + bird, // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. // documentation ```dart - } - - typedef SoundMaker = void Function(); +} + +typedef SoundMaker = void Function(); // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // documentation ```dart - - mixin SleepMixin { + +mixin SleepMixin { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# // documentation ```dart - void sleep() { + void sleep() { // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). // documentation ```dart - print('zzz...'); + print('zzz...'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - } } - - class Animal with SleepMixin { +} + +class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // documentation ```dart // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# - String name; + String name; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart - AnimalType type; + AnimalType type; // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // documentation ```dart - SoundMaker? soundMaker; + SoundMaker? soundMaker; // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // documentation ```dart - - Animal(this.name, {required this.type}) { + + Animal(this.name, {required this.type}) { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# @@ -58,56 +58,56 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // documentation ```dart - switch (type) { + switch (type) { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. - case AnimalType.cat: + case AnimalType.cat: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - soundMaker = () => print('Meow!'); + soundMaker = () => print('Meow!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.dog: + break; + case AnimalType.dog: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - soundMaker = () => print('Woof!'); + soundMaker = () => print('Woof!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.bird: + break; + case AnimalType.bird: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. - soundMaker = () => print('Chirp!'); + soundMaker = () => print('Chirp!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - default: - soundMaker = () => print('Unknown animal type'); + break; + default: + soundMaker = () => print('Unknown animal type'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - } } - - void makeSound() { + } + + void makeSound() { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). // documentation ```dart - soundMaker?.call(); + soundMaker?.call(); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. - } - - @override + } + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String toString() { + String toString() { // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart - return '$name the $type'; + return '$name the $type'; // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. - } } - - int calculateSum(List numbers) { +} + +int calculateSum(List numbers) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart @@ -115,7 +115,7 @@ // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart - return numbers.reduce((value, element) => value + element); + return numbers.reduce((value, element) => value + element); // ^^^^^^^ reference local 1 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^^^^^ definition local 2 @@ -124,24 +124,24 @@ // documentation ```dart // ^^^^^ reference local 2 // ^^^^^^^ reference local 3 - } - - void main() { +} + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart - List numbers = [1, 2, 3, 4, 5]; + List numbers = [1, 2, 3, 4, 5]; // ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart - int sum = calculateSum(numbers); + int sum = calculateSum(numbers); // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition local 5 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // ^^^^^^^ reference local 4 - - Animal cat = Animal('Kitty', type: AnimalType.cat); + + Animal cat = Animal('Kitty', type: AnimalType.cat); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 6 // documentation ```dart @@ -149,7 +149,7 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - Animal dog = Animal('Buddy', type: AnimalType.dog); + Animal dog = Animal('Buddy', type: AnimalType.dog); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 7 // documentation ```dart @@ -157,37 +157,37 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - - cat.makeSound(); + + cat.makeSound(); // ^^^ reference local 6 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - cat.sleep(); + cat.sleep(); // ^^^ reference local 6 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - dog.makeSound(); + + dog.makeSound(); // ^^^ reference local 7 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - dog.sleep(); + dog.sleep(); // ^^^ reference local 7 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - print(cat); + + print(cat); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 6 - print(dog); + print(dog); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 7 - print('The sum of $numbers is $sum'); + print('The sum of $numbers is $sum'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^ reference local 4 // ^^^ reference local 5 - - print(math.Rectangle(1,2,3,4)); + + print(math.Rectangle(1, 2, 3, 4)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# - - [1,2].reduce((a, b) => a + b); + + [1, 2].reduce((a, b) => a + b); // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^ definition local 8 // documentation ```dart @@ -195,16 +195,16 @@ // documentation ```dart // ^ reference local 8 // ^ reference local 9 - } - - void test(String Function(int) p) {} +} + +void test(String Function(int) p) {} // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/test(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 10 // documentation ```dart - void deepTest(String Function(void Function(String test)) p) {} +void deepTest(String Function(void Function(String test)) p) {} // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/deepTest(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index dc13b506..b22933ab 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -1,60 +1,60 @@ - import 'more.dart' deferred as more; +import 'more.dart' deferred as more; // definition scip-dart pub dart_test 1.0.0 lib/other.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/more. // documentation ```dart - - class Foo { + +class Foo { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // documentation ```dart - int _far; + int _far; // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart - Foo(this._far); + Foo(this._far); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // ^^^^ reference local 0 // ^^^^ definition local 1 // documentation ```dart - } - - class Bar { +} + +class Bar { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // documentation ```dart - String _someValue; + String _someValue; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^ definition local 2 // documentation ```dart - Bar(this._someValue); + Bar(this._someValue); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^ reference local 2 // ^^^^^^^^^^ definition local 3 // documentation ```dart - - void someMethod() { + + void someMethod() { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). // documentation ```dart - _someValue = 'asdf'; + _someValue = 'asdf'; // ^^^^^^^^^^ reference local 2 - print(_someValue); + print(_someValue); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^^^^ reference local 2 - } } - - void main() { +} + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/main(). // documentation ```dart - more.loadLibrary().then((_) => { + more.loadLibrary().then((_) => { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/more. // ^^^^ reference scip-dart pub dart:async 3.1.0 dart:async/future.dart/Future#then(). // ^ definition local 4 // documentation ```dart - Bar('a').someMethod.call() + Bar('a').someMethod.call() // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). - }); - } + }); +} diff --git a/snapshots/output/basic-project/test/basic_test.dart b/snapshots/output/basic-project/test/basic_test.dart index a7506aae..554611cc 100755 --- a/snapshots/output/basic-project/test/basic_test.dart +++ b/snapshots/output/basic-project/test/basic_test.dart @@ -1,15 +1,15 @@ - import 'package:test/test.dart'; +import 'package:test/test.dart'; // definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/ - - void main() { + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/main(). // documentation ```dart - group('some test', () { + group('some test', () { // ^^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/group(). - test('equality', () { + test('equality', () { // ^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/test(). - expect(1, 1); + expect(1, 1); // ^^^^^^ reference scip-dart pub matcher 0.12.16 lib/src/expect/expect.dart/expect(). - }); }); - } + }); +} diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index a5f95a72..a9cb17be 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -1,4 +1,4 @@ - (String, int) userInfo(Map json) { +(String, int) userInfo(Map json) { // definition scip-dart pub dart3_features 1.0.0 lib/main.dart/ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# @@ -8,152 +8,154 @@ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition local 0 // documentation ```dart - return (json['name'] as String, json['height'] as int); + return (json['name'] as String, json['height'] as int); // ^^^^ reference local 0 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ reference local 0 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - } - - void parser(int charCode) { +} + +void parser(int charCode) { // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/parser(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 1 // documentation ```dart - const slash = 1; + const slash = 1; // ^^^^^ definition local 2 // documentation ```dart - const star = 2; + const star = 2; // ^^^^ definition local 3 // documentation ```dart - const plus = 3; + const plus = 3; // ^^^^ definition local 4 // documentation ```dart - const minus = 4; + const minus = 4; // ^^^^^ definition local 5 // documentation ```dart - - final nextCharCode = 'a'; + + final nextCharCode = 'a'; // ^^^^^^^^^^^^ definition local 6 // documentation ```dart - const digit0 = 0; + const digit0 = 0; // ^^^^^^ definition local 7 // documentation ```dart - const digit9 = 9; + const digit9 = 9; // ^^^^^^ definition local 8 // documentation ```dart - - void skipComment() {} + + void skipComment() {} // ^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). // documentation ```dart - void operatorFn(int charCode) {} + void operatorFn(int charCode) {} // ^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 9 // documentation ```dart - void number() {} + void number() {} // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). // documentation ```dart - void invalid() {} + void invalid() {} // ^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). // documentation ```dart - - switch (charCode) { + + switch (charCode) { // ^^^^^^^^ reference local 1 - case slash when nextCharCode == slash: + case slash when nextCharCode == slash: // ^^^^^ reference local 2 // ^^^^^^^^^^^^ reference local 6 // ^^^^^ reference local 2 - skipComment(); + skipComment(); // ^^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). - - case slash || star || plus || minus: + + case slash || star || plus || minus: // ^^^^^ reference local 2 // ^^^^ reference local 3 // ^^^^ reference local 4 // ^^^^^ reference local 5 - operatorFn(charCode); + operatorFn(charCode); // ^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // ^^^^^^^^ reference local 1 - - case >= digit0 && <= digit9: + + case >= digit0 && <= digit9: // ^^^^^^ reference local 7 // ^^^^^^ reference local 8 - number(); + number(); // ^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). - - default: - invalid(); + + default: + invalid(); // ^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). - } } - - const six = 6; +} + +const six = 6; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/six. // documentation ```dart - const msg = 'Feeling the Monday blues?'; +const msg = 'Feeling the Monday blues?'; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/msg. // documentation ```dart - String describeDate(DateTime dt) { +String describeDate(DateTime dt) { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/describeDate(). // documentation ```dart // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime# // ^^ definition local 10 // documentation ```dart - const one = 1; + const one = 1; // ^^^ definition local 11 // documentation ```dart - return switch (dt.weekday) { + return switch (dt.weekday) { // ^^ reference local 10 // ^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime#weekday. - one => 'Feeling the Monday blues?', + one => 'Feeling the Monday blues?', // ^^^ reference local 11 - 7 || six => 'Enjoy the weekend!', + 7 || six => 'Enjoy the weekend!', // ^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/six. - _ => 'Hang in there.' - }; - } - - void main() { + _ => 'Hang in there.' + }; +} + +void main() { // ^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/main(). // documentation ```dart - var ( - String name, + var ( + String name, // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# - int height, + int height, // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - ) = userInfo({'name': 'Michael', 'height': 180}); + ) = userInfo({'name': 'Michael', 'height': 180}); // ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). - print('User $name is $height cm tall.'); + print('User $name is $height cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^ reference local 12 // ^^^^^^ reference local 13 - - - final json = {'name': 'Michael', 'height': 180}; + + final json = {'name': 'Michael', 'height': 180}; // ^^^^ definition local 14 // documentation ```dart - if (json case {'name': 'Michael', 'height': int h}) { + if (json case {'name': 'Michael', 'height': int h}) { // ^^^^ reference local 14 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - print('Michael is $h cm tall.'); + print('Michael is $h cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 15 - } } - - base class Foo {} +} + +base class Foo {} + // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Foo# // documentation ```dart - final class Bar {} +final class Bar {} + // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Bar# // documentation ```dart - interface class Car {} +interface class Car {} + // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Car# // documentation ```dart - sealed class Zar {} +sealed class Zar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Zar# // documentation ```dart diff --git a/snapshots/output/relationships-project/lib/main.dart b/snapshots/output/relationships-project/lib/main.dart index e717070d..359d6c74 100755 --- a/snapshots/output/relationships-project/lib/main.dart +++ b/snapshots/output/relationships-project/lib/main.dart @@ -1,34 +1,34 @@ - abstract class Mammal { +abstract class Mammal { // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# // documentation ```dart - String get hierarchy; + String get hierarchy; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. // documentation ```dart - } - - abstract class Animal extends Mammal { +} + +abstract class Animal extends Mammal { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# - String sound() => 'NOISE!'; + String sound() => 'NOISE!'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). // documentation ```dart - } - - mixin SwimAction { +} + +mixin SwimAction { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# // documentation ```dart - void execute() => print('swimming...'); + void execute() => print('swimming...'); // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction#execute(). // documentation ```dart // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - } - - class Dog extends Animal with SwimAction { +} + +class Dog extends Animal with SwimAction { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# implementation @@ -36,19 +36,19 @@ // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# - @override + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String sound() => 'woof'; + String sound() => 'woof'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#sound(). // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). implementation reference - - @override + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String get hierarchy => 'dog.animal.mammal'; + String get hierarchy => 'dog.animal.mammal'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#hierarchy. // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. implementation reference - } +} From 5e5529cc5531b7fe6b1edbcac6db746c438ab73f Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Fri, 1 Sep 2023 10:09:34 -0600 Subject: [PATCH 12/27] removed unused dependency --- pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index f8b3973b..ff403cbc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,5 +19,4 @@ dependencies: dev_dependencies: dependency_validator: ^3.2.2 - glob: ^2.1.1 workiva_analysis_options: ^1.0.0 \ No newline at end of file From ec3b1e8355ca5a811084f29c4c099f4b68a6bc67 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Fri, 1 Sep 2023 10:09:45 -0600 Subject: [PATCH 13/27] pubgot --- pubspec.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.lock b/pubspec.lock index b35fb170..10d5920e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -98,7 +98,7 @@ packages: source: hosted version: "1.1.0" glob: - dependency: "direct dev" + dependency: transitive description: name: glob sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" From ff61f0dc3cf52736f9014fc74b30640316737cdc Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Fri, 1 Sep 2023 10:14:23 -0600 Subject: [PATCH 14/27] regen snaps --- snapshots/output/basic-project/lib/main.dart | 95 +++++------ snapshots/output/basic-project/lib/more.dart | 159 +++++++++--------- snapshots/output/basic-project/lib/other.dart | 45 +++-- .../output/basic-project/test/basic_test.dart | 17 +- snapshots/output/dart3-features/lib/main.dart | 131 ++++++++------- .../relationships-project/lib/main.dart | 39 ++--- 6 files changed, 245 insertions(+), 241 deletions(-) diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 79cb6cef..78173a4b 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -1,11 +1,11 @@ -import 'package:dart_test/other.dart'; + import 'package:dart_test/other.dart'; // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ - -/// This is a fib function -/// -/// Takes a number -/// Returns a number -int fib(int n) { + + /// This is a fib function + /// + /// Takes a number + /// Returns a number + int fib(int n) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // documentation ```dart @@ -13,95 +13,96 @@ int fib(int n) { // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart - if (n <= 1) return 0; + if (n <= 1) return 0; // ^ reference local 0 - return fib(n - 1) + fib(n - 2); + return fib(n - 1) + fib(n - 2); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 -} - -void print_fib(int a) { + } + + void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart - print(fib(a)); + print(fib(a)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 1 -} - -final y = 'Hello'; + } + + final y = 'Hello'; // ^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/y. // documentation ```dart -String capture() { + String capture() { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart - return y; + return y; // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. -} - -final capture_lambda = () => y; + } + + final capture_lambda = () => y; // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture_lambda. // documentation ```dart // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. - -void main() { + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/main(). // documentation ```dart - for (var i = 0; i <= 10; i++) {} + for (var i = 0; i <= 10; i++) {} // ^ definition local 2 // documentation ```dart // ^ reference local 2 // ^ reference local 2 - - for (var i in [1, 2, 3]) { + + for (var i in [1, 2, 3]) { // ^ definition local 3 // documentation ```dart - print(i); + print(i); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 3 - } - - var a = 0; + } + + var a = 0; // ^ definition local 4 // documentation ```dart - a = 1; + a = 1; // ^ reference local 4 - print_fib(a); + print_fib(a); // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // ^ reference local 4 -} - -void forever() { + } + + void forever() { // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). // documentation ```dart - return forever(); + return forever(); // ^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). -} - -class SomeLocalClass {} + } + + class SomeLocalClass {} // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# // documentation ```dart - -/// Reference parameter: [value] + + /// Reference parameter: [value] // ^^^^^ reference local 5 -/// Reference class: [SomeLocalClass] + /// Reference class: [SomeLocalClass] // ^^^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# -/// Reference external class: [Foo] + /// Reference external class: [Foo] // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# -/// Missing Reference: [IDontExist] -void someFunction(int value) { + /// Missing Reference: [IDontExist] + void someFunction(int value) { // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/someFunction(). // documentation ```dart // documentation Reference parameter: [value] // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^ definition local 5 // documentation ```dart - Foo(1); + Foo(1); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# -} + } + diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index 23daa1f3..72833b66 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -1,54 +1,54 @@ -import 'dart:math' as math; + import 'dart:math' as math; // definition scip-dart pub dart_test 1.0.0 lib/more.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/math. // documentation ```dart - -enum AnimalType { + + enum AnimalType { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // documentation ```dart - cat, + cat, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. // documentation ```dart - dog, + dog, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. // documentation ```dart - bird, + bird, // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. // documentation ```dart -} - -typedef SoundMaker = void Function(); + } + + typedef SoundMaker = void Function(); // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // documentation ```dart - -mixin SleepMixin { + + mixin SleepMixin { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# // documentation ```dart - void sleep() { + void sleep() { // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). // documentation ```dart - print('zzz...'); + print('zzz...'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). + } } -} - -class Animal with SleepMixin { + + class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // documentation ```dart // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# - String name; + String name; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart - AnimalType type; + AnimalType type; // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // documentation ```dart - SoundMaker? soundMaker; + SoundMaker? soundMaker; // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // documentation ```dart - - Animal(this.name, {required this.type}) { + + Animal(this.name, {required this.type}) { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# @@ -58,56 +58,56 @@ class Animal with SleepMixin { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // documentation ```dart - switch (type) { + switch (type) { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. - case AnimalType.cat: + case AnimalType.cat: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - soundMaker = () => print('Meow!'); + soundMaker = () => print('Meow!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.dog: + break; + case AnimalType.dog: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - soundMaker = () => print('Woof!'); + soundMaker = () => print('Woof!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.bird: + break; + case AnimalType.bird: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. - soundMaker = () => print('Chirp!'); + soundMaker = () => print('Chirp!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - default: - soundMaker = () => print('Unknown animal type'); + break; + default: + soundMaker = () => print('Unknown animal type'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). + } } - } - - void makeSound() { + + void makeSound() { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). // documentation ```dart - soundMaker?.call(); + soundMaker?.call(); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. - } - - @override + } + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String toString() { + String toString() { // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart - return '$name the $type'; + return '$name the $type'; // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. + } } -} - -int calculateSum(List numbers) { + + int calculateSum(List numbers) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart @@ -115,7 +115,7 @@ int calculateSum(List numbers) { // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart - return numbers.reduce((value, element) => value + element); + return numbers.reduce((value, element) => value + element); // ^^^^^^^ reference local 1 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^^^^^ definition local 2 @@ -124,24 +124,24 @@ int calculateSum(List numbers) { // documentation ```dart // ^^^^^ reference local 2 // ^^^^^^^ reference local 3 -} - -void main() { + } + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart - List numbers = [1, 2, 3, 4, 5]; + List numbers = [1, 2, 3, 4, 5]; // ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart - int sum = calculateSum(numbers); + int sum = calculateSum(numbers); // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition local 5 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // ^^^^^^^ reference local 4 - - Animal cat = Animal('Kitty', type: AnimalType.cat); + + Animal cat = Animal('Kitty', type: AnimalType.cat); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 6 // documentation ```dart @@ -149,7 +149,7 @@ void main() { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - Animal dog = Animal('Buddy', type: AnimalType.dog); + Animal dog = Animal('Buddy', type: AnimalType.dog); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 7 // documentation ```dart @@ -157,57 +157,58 @@ void main() { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - - cat.makeSound(); + + cat.makeSound(); // ^^^ reference local 6 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - cat.sleep(); + cat.sleep(); // ^^^ reference local 6 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - dog.makeSound(); + + dog.makeSound(); // ^^^ reference local 7 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - dog.sleep(); + dog.sleep(); // ^^^ reference local 7 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - print(cat); + + print(cat); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 6 - print(dog); + print(dog); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 7 - print('The sum of $numbers is $sum'); + print('The sum of $numbers is $sum'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^ reference local 4 // ^^^ reference local 5 - - print(math.Rectangle(1, 2, 3, 4)); + + print(math.Rectangle(1, 2, 3, 4)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# - - [1, 2].reduce((a, b) => a + b); -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). -// ^ definition local 8 -// documentation ```dart -// ^ definition local 9 -// documentation ```dart -// ^ reference local 8 -// ^ reference local 9 -} - -void test(String Function(int) p) {} + + [1, 2].reduce((a, b) => a + b); +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). +// ^ definition local 8 +// documentation ```dart +// ^ definition local 9 +// documentation ```dart +// ^ reference local 8 +// ^ reference local 9 + } + + void test(String Function(int) p) {} // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/test(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 10 // documentation ```dart -void deepTest(String Function(void Function(String test)) p) {} + void deepTest(String Function(void Function(String test)) p) {} // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/deepTest(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^ definition local 11 // documentation ```dart + diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index b22933ab..76b4aa5c 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -1,60 +1,59 @@ -import 'more.dart' deferred as more; + import 'more.dart' deferred as more; // definition scip-dart pub dart_test 1.0.0 lib/other.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/more. // documentation ```dart - -class Foo { + + class Foo { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // documentation ```dart - int _far; + int _far; // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart - Foo(this._far); + Foo(this._far); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // ^^^^ reference local 0 // ^^^^ definition local 1 // documentation ```dart -} - -class Bar { + } + + class Bar { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // documentation ```dart - String _someValue; + String _someValue; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^ definition local 2 // documentation ```dart - Bar(this._someValue); + Bar(this._someValue); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^ reference local 2 // ^^^^^^^^^^ definition local 3 // documentation ```dart - - void someMethod() { + + void someMethod() { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). // documentation ```dart - _someValue = 'asdf'; + _someValue = 'asdf'; // ^^^^^^^^^^ reference local 2 - print(_someValue); + print(_someValue); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^^^^ reference local 2 + } } -} - -void main() { + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/main(). // documentation ```dart - more.loadLibrary().then((_) => { + more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/more. // ^^^^ reference scip-dart pub dart:async 3.1.0 dart:async/future.dart/Future#then(). // ^ definition local 4 // documentation ```dart - Bar('a').someMethod.call() -// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). - }); -} +// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). + } + diff --git a/snapshots/output/basic-project/test/basic_test.dart b/snapshots/output/basic-project/test/basic_test.dart index 554611cc..048a8dcd 100755 --- a/snapshots/output/basic-project/test/basic_test.dart +++ b/snapshots/output/basic-project/test/basic_test.dart @@ -1,15 +1,16 @@ -import 'package:test/test.dart'; + import 'package:test/test.dart'; // definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/ - -void main() { + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/main(). // documentation ```dart - group('some test', () { + group('some test', () { // ^^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/group(). - test('equality', () { + test('equality', () { // ^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/test(). - expect(1, 1); + expect(1, 1); // ^^^^^^ reference scip-dart pub matcher 0.12.16 lib/src/expect/expect.dart/expect(). + }); }); - }); -} + } + diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index a9cb17be..4966e134 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -1,4 +1,4 @@ -(String, int) userInfo(Map json) { + (String, int) userInfo(Map json) { // definition scip-dart pub dart3_features 1.0.0 lib/main.dart/ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# @@ -8,154 +8,155 @@ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition local 0 // documentation ```dart - return (json['name'] as String, json['height'] as int); + return (json['name'] as String, json['height'] as int); // ^^^^ reference local 0 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ reference local 0 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -} - -void parser(int charCode) { + } + + void parser(int charCode) { // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/parser(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 1 // documentation ```dart - const slash = 1; + const slash = 1; // ^^^^^ definition local 2 // documentation ```dart - const star = 2; + const star = 2; // ^^^^ definition local 3 // documentation ```dart - const plus = 3; + const plus = 3; // ^^^^ definition local 4 // documentation ```dart - const minus = 4; + const minus = 4; // ^^^^^ definition local 5 // documentation ```dart - - final nextCharCode = 'a'; + + final nextCharCode = 'a'; // ^^^^^^^^^^^^ definition local 6 // documentation ```dart - const digit0 = 0; + const digit0 = 0; // ^^^^^^ definition local 7 // documentation ```dart - const digit9 = 9; + const digit9 = 9; // ^^^^^^ definition local 8 // documentation ```dart - - void skipComment() {} + + void skipComment() {} // ^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). // documentation ```dart - void operatorFn(int charCode) {} + void operatorFn(int charCode) {} // ^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 9 // documentation ```dart - void number() {} + void number() {} // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). // documentation ```dart - void invalid() {} + void invalid() {} // ^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). // documentation ```dart - - switch (charCode) { + + switch (charCode) { // ^^^^^^^^ reference local 1 - case slash when nextCharCode == slash: + case slash when nextCharCode == slash: // ^^^^^ reference local 2 // ^^^^^^^^^^^^ reference local 6 // ^^^^^ reference local 2 - skipComment(); + skipComment(); // ^^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). - - case slash || star || plus || minus: + + case slash || star || plus || minus: // ^^^^^ reference local 2 // ^^^^ reference local 3 // ^^^^ reference local 4 // ^^^^^ reference local 5 - operatorFn(charCode); + operatorFn(charCode); // ^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // ^^^^^^^^ reference local 1 - - case >= digit0 && <= digit9: + + case >= digit0 && <= digit9: // ^^^^^^ reference local 7 // ^^^^^^ reference local 8 - number(); + number(); // ^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). - - default: - invalid(); + + default: + invalid(); // ^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). + } } -} - -const six = 6; + + const six = 6; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/six. // documentation ```dart -const msg = 'Feeling the Monday blues?'; + const msg = 'Feeling the Monday blues?'; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/msg. // documentation ```dart -String describeDate(DateTime dt) { + String describeDate(DateTime dt) { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/describeDate(). // documentation ```dart // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime# // ^^ definition local 10 // documentation ```dart - const one = 1; + const one = 1; // ^^^ definition local 11 // documentation ```dart - return switch (dt.weekday) { + return switch (dt.weekday) { // ^^ reference local 10 // ^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime#weekday. - one => 'Feeling the Monday blues?', -// ^^^ reference local 11 - 7 || six => 'Enjoy the weekend!', -// ^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/six. - _ => 'Hang in there.' - }; -} - -void main() { + one => 'Feeling the Monday blues?', +// ^^^ reference local 11 + 7 || six => 'Enjoy the weekend!', +// ^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/six. + _ => 'Hang in there.' + }; + } + + void main() { // ^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/main(). // documentation ```dart - var ( - String name, + var ( + String name, // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# - int height, + int height, // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - ) = userInfo({'name': 'Michael', 'height': 180}); + ) = userInfo({'name': 'Michael', 'height': 180}); // ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). - print('User $name is $height cm tall.'); + print('User $name is $height cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^ reference local 12 // ^^^^^^ reference local 13 - - final json = {'name': 'Michael', 'height': 180}; + + final json = {'name': 'Michael', 'height': 180}; // ^^^^ definition local 14 // documentation ```dart - if (json case {'name': 'Michael', 'height': int h}) { + if (json case {'name': 'Michael', 'height': int h}) { // ^^^^ reference local 14 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - print('Michael is $h cm tall.'); + print('Michael is $h cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 15 + } } -} - -base class Foo {} - + + base class Foo {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Foo# // documentation ```dart -final class Bar {} - + + final class Bar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Bar# // documentation ```dart -interface class Car {} - + + interface class Car {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Car# // documentation ```dart -sealed class Zar {} + + sealed class Zar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Zar# // documentation ```dart + diff --git a/snapshots/output/relationships-project/lib/main.dart b/snapshots/output/relationships-project/lib/main.dart index 359d6c74..46991bf0 100755 --- a/snapshots/output/relationships-project/lib/main.dart +++ b/snapshots/output/relationships-project/lib/main.dart @@ -1,34 +1,34 @@ -abstract class Mammal { + abstract class Mammal { // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# // documentation ```dart - String get hierarchy; + String get hierarchy; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. // documentation ```dart -} - -abstract class Animal extends Mammal { + } + + abstract class Animal extends Mammal { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# - String sound() => 'NOISE!'; + String sound() => 'NOISE!'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). // documentation ```dart -} - -mixin SwimAction { + } + + mixin SwimAction { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# // documentation ```dart - void execute() => print('swimming...'); + void execute() => print('swimming...'); // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction#execute(). // documentation ```dart // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). -} - -class Dog extends Animal with SwimAction { + } + + class Dog extends Animal with SwimAction { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# implementation @@ -36,19 +36,20 @@ class Dog extends Animal with SwimAction { // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# - @override + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String sound() => 'woof'; + String sound() => 'woof'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#sound(). // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). implementation reference - - @override + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String get hierarchy => 'dog.animal.mammal'; + String get hierarchy => 'dog.animal.mammal'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#hierarchy. // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. implementation reference -} + } + From fe630e5ac0e7db779d057b6ecd0c2364ae1f93ed Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Sun, 10 Sep 2023 21:28:24 -1000 Subject: [PATCH 15/27] fixed issue with null typedef references --- lib/src/scip_visitor.dart | 4 +++- snapshots/output/basic-project/lib/more.dart | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index 22b32ac0..ca26fb72 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -145,7 +145,9 @@ class ScipVisitor extends GeneralizingAstVisitor { } void _visitTypeAnnotation(TypeAnnotation node) { - final element = node.type?.element; + final element = node is NamedType + ? node.element + : node.type?.element; if (element == null) return; _registerAsReference( diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index 72833b66..f6aecd3d 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -45,6 +45,7 @@ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // documentation ```dart SoundMaker? soundMaker; +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // documentation ```dart From 80645e30eb104e61eadfbc061a5f59641debcbeb Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Sun, 10 Sep 2023 22:01:21 -1000 Subject: [PATCH 16/27] added ast-printer to assist in debugging dart ast --- Makefile | 5 ++- lib/src/scip_visitor.dart | 1 + pubspec.lock | 8 +++++ pubspec.yaml | 1 + tool/ast_printer.dart | 65 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 tool/ast_printer.dart diff --git a/Makefile b/Makefile index dbb4f3fe..295f8727 100644 --- a/Makefile +++ b/Makefile @@ -25,4 +25,7 @@ gen-proto: protoc --dart_out=. ./lib/src/gen/scip.proto print: - scip print ./index.scip \ No newline at end of file + scip print ./index.scip + +print-ast: + dart ./tool/ast_printer.dart ./snapshots/input/staging-project \ No newline at end of file diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index ca26fb72..95c0663b 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -145,6 +145,7 @@ class ScipVisitor extends GeneralizingAstVisitor { } void _visitTypeAnnotation(TypeAnnotation node) { + print(node.runtimeType); final element = node is NamedType ? node.element : node.type?.element; diff --git a/pubspec.lock b/pubspec.lock index 10d5920e..50972a1a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -41,6 +41,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" + chalk: + dependency: "direct main" + description: + name: chalk + sha256: "53491e94aea65cddf07a63491384cd2018c1ccf188c973dbb935fbee9db609c8" + url: "https://pub.dev" + source: hosted + version: "1.2.1" checked_yaml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index ff403cbc..4bb18ccd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,5 +18,6 @@ dependencies: pubspec_parse: ^1.2.1 dev_dependencies: + chalk: ^1.2.1 dependency_validator: ^3.2.2 workiva_analysis_options: ^1.0.0 \ No newline at end of file diff --git a/tool/ast_printer.dart b/tool/ast_printer.dart new file mode 100644 index 00000000..e43b7740 --- /dev/null +++ b/tool/ast_printer.dart @@ -0,0 +1,65 @@ +import 'dart:io'; + +import 'package:analyzer/dart/analysis/analysis_context_collection.dart'; +import 'package:analyzer/dart/analysis/results.dart'; +import 'package:analyzer/dart/ast/ast.dart'; +import 'package:analyzer/dart/ast/visitor.dart'; +import 'package:args/args.dart'; +import 'package:chalk/chalk.dart'; +import 'package:package_config/package_config.dart'; +import 'package:path/path.dart' as p; + +Future main(List args) async { + final result = ArgParser().parse(args); + + final root = result.rest.first; + final dirPath = p.normalize(p.absolute(root)); + + final packageConfig = await findPackageConfig(Directory(root)); + if (packageConfig == null) { + stderr.writeln('ERROR: Unable to locate packageConfig'); + exit(1); + } + + final allPackageRoots = packageConfig.packages + .map((package) => p.normalize(package.packageUriRoot.toFilePath())) + .toList(); + + final collection = AnalysisContextCollection( + includedPaths: [ + ...allPackageRoots, + dirPath, + ], + ); + + final context = collection.contextFor(dirPath); + final resolvedUnitFutures = context.contextRoot + .analyzedFiles() + .where((file) => p.extension(file) == '.dart') + .map(context.currentSession.getResolvedUnit); + + final resolvedUnits = await Future.wait(resolvedUnitFutures); + + resolvedUnits + .whereType() + .forEach((unit) { + print(''); + print('${chalk.yellow(unit.path.substring(dirPath.length + 1))}'); + unit.unit.visitChildren(AstPrinter()); + }); + print(''); +} + +class AstPrinter extends GeneralizingAstVisitor { + int indent = 1; + + @override + void visitNode(AstNode node) { + final indentStr = List.filled(indent, ' ').join(''); + print('$indentStr${chalk.green(node.toString())} ${chalk.faint(node.runtimeType.toString())}'); + + indent++; + super.visitNode(node); + indent--; + } +} \ No newline at end of file From 804b6f605aa35cd618f282d68e3a5f9c056f4059 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Sun, 10 Sep 2023 22:03:47 -1000 Subject: [PATCH 17/27] removed print statement --- lib/src/scip_visitor.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index 95c0663b..ca26fb72 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -145,7 +145,6 @@ class ScipVisitor extends GeneralizingAstVisitor { } void _visitTypeAnnotation(TypeAnnotation node) { - print(node.runtimeType); final element = node is NamedType ? node.element : node.type?.element; From 467c9d3f54d1f1dfa87afe60244a9f5824414a7e Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Sun, 10 Sep 2023 22:03:57 -1000 Subject: [PATCH 18/27] fmt --- lib/src/scip_visitor.dart | 4 +- snapshots/output/basic-project/lib/main.dart | 95 ++++++------ snapshots/output/basic-project/lib/more.dart | 145 +++++++++--------- snapshots/output/basic-project/lib/other.dart | 39 +++-- .../output/basic-project/test/basic_test.dart | 17 +- snapshots/output/dart3-features/lib/main.dart | 127 ++++++++------- .../relationships-project/lib/main.dart | 39 +++-- tool/ast_printer.dart | 17 +- 8 files changed, 237 insertions(+), 246 deletions(-) diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index ca26fb72..9a85031b 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -145,9 +145,7 @@ class ScipVisitor extends GeneralizingAstVisitor { } void _visitTypeAnnotation(TypeAnnotation node) { - final element = node is NamedType - ? node.element - : node.type?.element; + final element = node is NamedType ? node.element : node.type?.element; if (element == null) return; _registerAsReference( diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 78173a4b..79cb6cef 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -1,11 +1,11 @@ - import 'package:dart_test/other.dart'; +import 'package:dart_test/other.dart'; // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ - - /// This is a fib function - /// - /// Takes a number - /// Returns a number - int fib(int n) { + +/// This is a fib function +/// +/// Takes a number +/// Returns a number +int fib(int n) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // documentation ```dart @@ -13,96 +13,95 @@ // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart - if (n <= 1) return 0; + if (n <= 1) return 0; // ^ reference local 0 - return fib(n - 1) + fib(n - 2); + return fib(n - 1) + fib(n - 2); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 - } - - void print_fib(int a) { +} + +void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart - print(fib(a)); + print(fib(a)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 1 - } - - final y = 'Hello'; +} + +final y = 'Hello'; // ^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/y. // documentation ```dart - String capture() { +String capture() { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart - return y; + return y; // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. - } - - final capture_lambda = () => y; +} + +final capture_lambda = () => y; // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture_lambda. // documentation ```dart // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. - - void main() { + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/main(). // documentation ```dart - for (var i = 0; i <= 10; i++) {} + for (var i = 0; i <= 10; i++) {} // ^ definition local 2 // documentation ```dart // ^ reference local 2 // ^ reference local 2 - - for (var i in [1, 2, 3]) { + + for (var i in [1, 2, 3]) { // ^ definition local 3 // documentation ```dart - print(i); + print(i); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 3 - } - - var a = 0; + } + + var a = 0; // ^ definition local 4 // documentation ```dart - a = 1; + a = 1; // ^ reference local 4 - print_fib(a); + print_fib(a); // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // ^ reference local 4 - } - - void forever() { +} + +void forever() { // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). // documentation ```dart - return forever(); + return forever(); // ^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). - } - - class SomeLocalClass {} +} + +class SomeLocalClass {} // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# // documentation ```dart - - /// Reference parameter: [value] + +/// Reference parameter: [value] // ^^^^^ reference local 5 - /// Reference class: [SomeLocalClass] +/// Reference class: [SomeLocalClass] // ^^^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# - /// Reference external class: [Foo] +/// Reference external class: [Foo] // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# - /// Missing Reference: [IDontExist] - void someFunction(int value) { +/// Missing Reference: [IDontExist] +void someFunction(int value) { // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/someFunction(). // documentation ```dart // documentation Reference parameter: [value] // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^ definition local 5 // documentation ```dart - Foo(1); + Foo(1); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# - } - +} diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index f6aecd3d..19c5b2a4 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -1,55 +1,55 @@ - import 'dart:math' as math; +import 'dart:math' as math; // definition scip-dart pub dart_test 1.0.0 lib/more.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/math. // documentation ```dart - - enum AnimalType { + +enum AnimalType { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // documentation ```dart - cat, + cat, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. // documentation ```dart - dog, + dog, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. // documentation ```dart - bird, + bird, // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. // documentation ```dart - } - - typedef SoundMaker = void Function(); +} + +typedef SoundMaker = void Function(); // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // documentation ```dart - - mixin SleepMixin { + +mixin SleepMixin { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# // documentation ```dart - void sleep() { + void sleep() { // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). // documentation ```dart - print('zzz...'); + print('zzz...'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - } } - - class Animal with SleepMixin { +} + +class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // documentation ```dart // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# - String name; + String name; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart - AnimalType type; + AnimalType type; // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // documentation ```dart - SoundMaker? soundMaker; + SoundMaker? soundMaker; // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // documentation ```dart - - Animal(this.name, {required this.type}) { + + Animal(this.name, {required this.type}) { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# @@ -59,56 +59,56 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // documentation ```dart - switch (type) { + switch (type) { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. - case AnimalType.cat: + case AnimalType.cat: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - soundMaker = () => print('Meow!'); + soundMaker = () => print('Meow!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.dog: + break; + case AnimalType.dog: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - soundMaker = () => print('Woof!'); + soundMaker = () => print('Woof!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.bird: + break; + case AnimalType.bird: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. - soundMaker = () => print('Chirp!'); + soundMaker = () => print('Chirp!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - default: - soundMaker = () => print('Unknown animal type'); + break; + default: + soundMaker = () => print('Unknown animal type'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - } } - - void makeSound() { + } + + void makeSound() { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). // documentation ```dart - soundMaker?.call(); + soundMaker?.call(); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. - } - - @override + } + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String toString() { + String toString() { // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart - return '$name the $type'; + return '$name the $type'; // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. - } } - - int calculateSum(List numbers) { +} + +int calculateSum(List numbers) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart @@ -116,7 +116,7 @@ // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart - return numbers.reduce((value, element) => value + element); + return numbers.reduce((value, element) => value + element); // ^^^^^^^ reference local 1 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^^^^^ definition local 2 @@ -125,24 +125,24 @@ // documentation ```dart // ^^^^^ reference local 2 // ^^^^^^^ reference local 3 - } - - void main() { +} + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart - List numbers = [1, 2, 3, 4, 5]; + List numbers = [1, 2, 3, 4, 5]; // ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart - int sum = calculateSum(numbers); + int sum = calculateSum(numbers); // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition local 5 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // ^^^^^^^ reference local 4 - - Animal cat = Animal('Kitty', type: AnimalType.cat); + + Animal cat = Animal('Kitty', type: AnimalType.cat); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 6 // documentation ```dart @@ -150,7 +150,7 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - Animal dog = Animal('Buddy', type: AnimalType.dog); + Animal dog = Animal('Buddy', type: AnimalType.dog); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 7 // documentation ```dart @@ -158,37 +158,37 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - - cat.makeSound(); + + cat.makeSound(); // ^^^ reference local 6 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - cat.sleep(); + cat.sleep(); // ^^^ reference local 6 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - dog.makeSound(); + + dog.makeSound(); // ^^^ reference local 7 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - dog.sleep(); + dog.sleep(); // ^^^ reference local 7 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - print(cat); + + print(cat); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 6 - print(dog); + print(dog); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 7 - print('The sum of $numbers is $sum'); + print('The sum of $numbers is $sum'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^ reference local 4 // ^^^ reference local 5 - - print(math.Rectangle(1, 2, 3, 4)); + + print(math.Rectangle(1, 2, 3, 4)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# - - [1, 2].reduce((a, b) => a + b); + + [1, 2].reduce((a, b) => a + b); // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^ definition local 8 // documentation ```dart @@ -196,20 +196,19 @@ // documentation ```dart // ^ reference local 8 // ^ reference local 9 - } - - void test(String Function(int) p) {} +} + +void test(String Function(int) p) {} // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/test(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 10 // documentation ```dart - void deepTest(String Function(void Function(String test)) p) {} +void deepTest(String Function(void Function(String test)) p) {} // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/deepTest(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^ definition local 11 // documentation ```dart - diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index 76b4aa5c..10e8f8a8 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -1,59 +1,58 @@ - import 'more.dart' deferred as more; +import 'more.dart' deferred as more; // definition scip-dart pub dart_test 1.0.0 lib/other.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/more. // documentation ```dart - - class Foo { + +class Foo { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // documentation ```dart - int _far; + int _far; // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart - Foo(this._far); + Foo(this._far); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // ^^^^ reference local 0 // ^^^^ definition local 1 // documentation ```dart - } - - class Bar { +} + +class Bar { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // documentation ```dart - String _someValue; + String _someValue; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^ definition local 2 // documentation ```dart - Bar(this._someValue); + Bar(this._someValue); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^ reference local 2 // ^^^^^^^^^^ definition local 3 // documentation ```dart - - void someMethod() { + + void someMethod() { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). // documentation ```dart - _someValue = 'asdf'; + _someValue = 'asdf'; // ^^^^^^^^^^ reference local 2 - print(_someValue); + print(_someValue); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^^^^ reference local 2 - } } - - void main() { +} + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/main(). // documentation ```dart - more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); + more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/more. // ^^^^ reference scip-dart pub dart:async 3.1.0 dart:async/future.dart/Future#then(). // ^ definition local 4 // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). - } - +} diff --git a/snapshots/output/basic-project/test/basic_test.dart b/snapshots/output/basic-project/test/basic_test.dart index 048a8dcd..554611cc 100755 --- a/snapshots/output/basic-project/test/basic_test.dart +++ b/snapshots/output/basic-project/test/basic_test.dart @@ -1,16 +1,15 @@ - import 'package:test/test.dart'; +import 'package:test/test.dart'; // definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/ - - void main() { + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/main(). // documentation ```dart - group('some test', () { + group('some test', () { // ^^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/group(). - test('equality', () { + test('equality', () { // ^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/test(). - expect(1, 1); + expect(1, 1); // ^^^^^^ reference scip-dart pub matcher 0.12.16 lib/src/expect/expect.dart/expect(). - }); }); - } - + }); +} diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index 4966e134..a4255337 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -1,4 +1,4 @@ - (String, int) userInfo(Map json) { +(String, int) userInfo(Map json) { // definition scip-dart pub dart3_features 1.0.0 lib/main.dart/ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# @@ -8,155 +8,154 @@ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition local 0 // documentation ```dart - return (json['name'] as String, json['height'] as int); + return (json['name'] as String, json['height'] as int); // ^^^^ reference local 0 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ reference local 0 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - } - - void parser(int charCode) { +} + +void parser(int charCode) { // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/parser(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 1 // documentation ```dart - const slash = 1; + const slash = 1; // ^^^^^ definition local 2 // documentation ```dart - const star = 2; + const star = 2; // ^^^^ definition local 3 // documentation ```dart - const plus = 3; + const plus = 3; // ^^^^ definition local 4 // documentation ```dart - const minus = 4; + const minus = 4; // ^^^^^ definition local 5 // documentation ```dart - - final nextCharCode = 'a'; + + final nextCharCode = 'a'; // ^^^^^^^^^^^^ definition local 6 // documentation ```dart - const digit0 = 0; + const digit0 = 0; // ^^^^^^ definition local 7 // documentation ```dart - const digit9 = 9; + const digit9 = 9; // ^^^^^^ definition local 8 // documentation ```dart - - void skipComment() {} + + void skipComment() {} // ^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). // documentation ```dart - void operatorFn(int charCode) {} + void operatorFn(int charCode) {} // ^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 9 // documentation ```dart - void number() {} + void number() {} // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). // documentation ```dart - void invalid() {} + void invalid() {} // ^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). // documentation ```dart - - switch (charCode) { + + switch (charCode) { // ^^^^^^^^ reference local 1 - case slash when nextCharCode == slash: + case slash when nextCharCode == slash: // ^^^^^ reference local 2 // ^^^^^^^^^^^^ reference local 6 // ^^^^^ reference local 2 - skipComment(); + skipComment(); // ^^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). - - case slash || star || plus || minus: + + case slash || star || plus || minus: // ^^^^^ reference local 2 // ^^^^ reference local 3 // ^^^^ reference local 4 // ^^^^^ reference local 5 - operatorFn(charCode); + operatorFn(charCode); // ^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // ^^^^^^^^ reference local 1 - - case >= digit0 && <= digit9: + + case >= digit0 && <= digit9: // ^^^^^^ reference local 7 // ^^^^^^ reference local 8 - number(); + number(); // ^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). - - default: - invalid(); + + default: + invalid(); // ^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). - } } - - const six = 6; +} + +const six = 6; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/six. // documentation ```dart - const msg = 'Feeling the Monday blues?'; +const msg = 'Feeling the Monday blues?'; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/msg. // documentation ```dart - String describeDate(DateTime dt) { +String describeDate(DateTime dt) { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/describeDate(). // documentation ```dart // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime# // ^^ definition local 10 // documentation ```dart - const one = 1; + const one = 1; // ^^^ definition local 11 // documentation ```dart - return switch (dt.weekday) { + return switch (dt.weekday) { // ^^ reference local 10 // ^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime#weekday. - one => 'Feeling the Monday blues?', + one => 'Feeling the Monday blues?', // ^^^ reference local 11 - 7 || six => 'Enjoy the weekend!', + 7 || six => 'Enjoy the weekend!', // ^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/six. - _ => 'Hang in there.' - }; - } - - void main() { + _ => 'Hang in there.' + }; +} + +void main() { // ^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/main(). // documentation ```dart - var ( - String name, + var ( + String name, // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# - int height, + int height, // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - ) = userInfo({'name': 'Michael', 'height': 180}); + ) = userInfo({'name': 'Michael', 'height': 180}); // ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). - print('User $name is $height cm tall.'); + print('User $name is $height cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^ reference local 12 // ^^^^^^ reference local 13 - - final json = {'name': 'Michael', 'height': 180}; + + final json = {'name': 'Michael', 'height': 180}; // ^^^^ definition local 14 // documentation ```dart - if (json case {'name': 'Michael', 'height': int h}) { + if (json case {'name': 'Michael', 'height': int h}) { // ^^^^ reference local 14 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - print('Michael is $h cm tall.'); + print('Michael is $h cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 15 - } } - - base class Foo {} +} + +base class Foo {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Foo# // documentation ```dart - - final class Bar {} + +final class Bar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Bar# // documentation ```dart - - interface class Car {} + +interface class Car {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Car# // documentation ```dart - - sealed class Zar {} + +sealed class Zar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Zar# // documentation ```dart - diff --git a/snapshots/output/relationships-project/lib/main.dart b/snapshots/output/relationships-project/lib/main.dart index 46991bf0..359d6c74 100755 --- a/snapshots/output/relationships-project/lib/main.dart +++ b/snapshots/output/relationships-project/lib/main.dart @@ -1,34 +1,34 @@ - abstract class Mammal { +abstract class Mammal { // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# // documentation ```dart - String get hierarchy; + String get hierarchy; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. // documentation ```dart - } - - abstract class Animal extends Mammal { +} + +abstract class Animal extends Mammal { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# - String sound() => 'NOISE!'; + String sound() => 'NOISE!'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). // documentation ```dart - } - - mixin SwimAction { +} + +mixin SwimAction { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# // documentation ```dart - void execute() => print('swimming...'); + void execute() => print('swimming...'); // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction#execute(). // documentation ```dart // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - } - - class Dog extends Animal with SwimAction { +} + +class Dog extends Animal with SwimAction { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# implementation @@ -36,20 +36,19 @@ // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# - @override + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String sound() => 'woof'; + String sound() => 'woof'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#sound(). // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). implementation reference - - @override + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String get hierarchy => 'dog.animal.mammal'; + String get hierarchy => 'dog.animal.mammal'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#hierarchy. // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. implementation reference - } - +} diff --git a/tool/ast_printer.dart b/tool/ast_printer.dart index e43b7740..fe5a6b7d 100644 --- a/tool/ast_printer.dart +++ b/tool/ast_printer.dart @@ -40,13 +40,11 @@ Future main(List args) async { final resolvedUnits = await Future.wait(resolvedUnitFutures); - resolvedUnits - .whereType() - .forEach((unit) { - print(''); - print('${chalk.yellow(unit.path.substring(dirPath.length + 1))}'); - unit.unit.visitChildren(AstPrinter()); - }); + resolvedUnits.whereType().forEach((unit) { + print(''); + print('${chalk.yellow(unit.path.substring(dirPath.length + 1))}'); + unit.unit.visitChildren(AstPrinter()); + }); print(''); } @@ -56,10 +54,11 @@ class AstPrinter extends GeneralizingAstVisitor { @override void visitNode(AstNode node) { final indentStr = List.filled(indent, ' ').join(''); - print('$indentStr${chalk.green(node.toString())} ${chalk.faint(node.runtimeType.toString())}'); + print( + '$indentStr${chalk.green(node.toString())} ${chalk.faint(node.runtimeType.toString())}'); indent++; super.visitNode(node); indent--; } -} \ No newline at end of file +} From a59ccce2386ff5df01e20f72ea8582f9fdd68197 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Mon, 11 Sep 2023 09:21:56 -0700 Subject: [PATCH 19/27] fixed errors indexing prefixes --- lib/src/scip_visitor.dart | 22 ++- snapshots/output/basic-project/lib/main.dart | 95 +++++------ snapshots/output/basic-project/lib/more.dart | 148 +++++++++--------- snapshots/output/basic-project/lib/other.dart | 39 ++--- .../output/basic-project/test/basic_test.dart | 17 +- snapshots/output/dart3-features/lib/main.dart | 127 +++++++-------- .../relationships-project/lib/main.dart | 39 ++--- 7 files changed, 257 insertions(+), 230 deletions(-) diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index 9a85031b..482d9154 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -56,6 +56,8 @@ class ScipVisitor extends GeneralizingAstVisitor { _visitSimpleIdentifier(node); } else if (node is TypeAnnotation) { _visitTypeAnnotation(node); + } else if (node is ImportPrefixReference) { + _visitImportPrefixReference(node); } super.visitNode(node); @@ -145,9 +147,27 @@ class ScipVisitor extends GeneralizingAstVisitor { } void _visitTypeAnnotation(TypeAnnotation node) { - final element = node is NamedType ? node.element : node.type?.element; + final element = node is NamedType + ? node.element + : node.type?.element; + if (element == null) return; + + var offset = node.offset; + if (node is NamedType && node.importPrefix != null) { + offset += node.importPrefix!.name.length + 1; + } + + _registerAsReference( + element, + offset: offset, + length: element.nameLength, + ); + } + void _visitImportPrefixReference(ImportPrefixReference node) { + final element = node.element; if (element == null) return; + _registerAsReference( element, offset: node.offset, diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 79cb6cef..78173a4b 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -1,11 +1,11 @@ -import 'package:dart_test/other.dart'; + import 'package:dart_test/other.dart'; // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ - -/// This is a fib function -/// -/// Takes a number -/// Returns a number -int fib(int n) { + + /// This is a fib function + /// + /// Takes a number + /// Returns a number + int fib(int n) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // documentation ```dart @@ -13,95 +13,96 @@ int fib(int n) { // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart - if (n <= 1) return 0; + if (n <= 1) return 0; // ^ reference local 0 - return fib(n - 1) + fib(n - 2); + return fib(n - 1) + fib(n - 2); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 -} - -void print_fib(int a) { + } + + void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart - print(fib(a)); + print(fib(a)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 1 -} - -final y = 'Hello'; + } + + final y = 'Hello'; // ^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/y. // documentation ```dart -String capture() { + String capture() { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart - return y; + return y; // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. -} - -final capture_lambda = () => y; + } + + final capture_lambda = () => y; // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture_lambda. // documentation ```dart // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. - -void main() { + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/main(). // documentation ```dart - for (var i = 0; i <= 10; i++) {} + for (var i = 0; i <= 10; i++) {} // ^ definition local 2 // documentation ```dart // ^ reference local 2 // ^ reference local 2 - - for (var i in [1, 2, 3]) { + + for (var i in [1, 2, 3]) { // ^ definition local 3 // documentation ```dart - print(i); + print(i); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 3 - } - - var a = 0; + } + + var a = 0; // ^ definition local 4 // documentation ```dart - a = 1; + a = 1; // ^ reference local 4 - print_fib(a); + print_fib(a); // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // ^ reference local 4 -} - -void forever() { + } + + void forever() { // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). // documentation ```dart - return forever(); + return forever(); // ^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). -} - -class SomeLocalClass {} + } + + class SomeLocalClass {} // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# // documentation ```dart - -/// Reference parameter: [value] + + /// Reference parameter: [value] // ^^^^^ reference local 5 -/// Reference class: [SomeLocalClass] + /// Reference class: [SomeLocalClass] // ^^^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# -/// Reference external class: [Foo] + /// Reference external class: [Foo] // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# -/// Missing Reference: [IDontExist] -void someFunction(int value) { + /// Missing Reference: [IDontExist] + void someFunction(int value) { // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/someFunction(). // documentation ```dart // documentation Reference parameter: [value] // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^ definition local 5 // documentation ```dart - Foo(1); + Foo(1); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# -} + } + diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index 19c5b2a4..b6dcafa4 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -1,55 +1,55 @@ -import 'dart:math' as math; + import 'dart:math' as math; // definition scip-dart pub dart_test 1.0.0 lib/more.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/math. // documentation ```dart - -enum AnimalType { + + enum AnimalType { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // documentation ```dart - cat, + cat, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. // documentation ```dart - dog, + dog, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. // documentation ```dart - bird, + bird, // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. // documentation ```dart -} - -typedef SoundMaker = void Function(); + } + + typedef SoundMaker = void Function(); // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // documentation ```dart - -mixin SleepMixin { + + mixin SleepMixin { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# // documentation ```dart - void sleep() { + void sleep() { // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). // documentation ```dart - print('zzz...'); + print('zzz...'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). + } } -} - -class Animal with SleepMixin { + + class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // documentation ```dart // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# - String name; + String name; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart - AnimalType type; + AnimalType type; // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // documentation ```dart - SoundMaker? soundMaker; + SoundMaker? soundMaker; // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // documentation ```dart - - Animal(this.name, {required this.type}) { + + Animal(this.name, {required this.type}) { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# @@ -59,56 +59,56 @@ class Animal with SleepMixin { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // documentation ```dart - switch (type) { + switch (type) { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. - case AnimalType.cat: + case AnimalType.cat: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - soundMaker = () => print('Meow!'); + soundMaker = () => print('Meow!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.dog: + break; + case AnimalType.dog: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - soundMaker = () => print('Woof!'); + soundMaker = () => print('Woof!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.bird: + break; + case AnimalType.bird: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. - soundMaker = () => print('Chirp!'); + soundMaker = () => print('Chirp!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - default: - soundMaker = () => print('Unknown animal type'); + break; + default: + soundMaker = () => print('Unknown animal type'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). + } } - } - - void makeSound() { + + void makeSound() { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). // documentation ```dart - soundMaker?.call(); + soundMaker?.call(); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. - } - - @override + } + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String toString() { + String toString() { // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart - return '$name the $type'; + return '$name the $type'; // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. + } } -} - -int calculateSum(List numbers) { + + int calculateSum(List numbers) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart @@ -116,7 +116,7 @@ int calculateSum(List numbers) { // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart - return numbers.reduce((value, element) => value + element); + return numbers.reduce((value, element) => value + element); // ^^^^^^^ reference local 1 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^^^^^ definition local 2 @@ -125,24 +125,24 @@ int calculateSum(List numbers) { // documentation ```dart // ^^^^^ reference local 2 // ^^^^^^^ reference local 3 -} - -void main() { + } + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart - List numbers = [1, 2, 3, 4, 5]; + List numbers = [1, 2, 3, 4, 5]; // ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart - int sum = calculateSum(numbers); + int sum = calculateSum(numbers); // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition local 5 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // ^^^^^^^ reference local 4 - - Animal cat = Animal('Kitty', type: AnimalType.cat); + + Animal cat = Animal('Kitty', type: AnimalType.cat); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 6 // documentation ```dart @@ -150,7 +150,7 @@ void main() { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - Animal dog = Animal('Buddy', type: AnimalType.dog); + Animal dog = Animal('Buddy', type: AnimalType.dog); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 7 // documentation ```dart @@ -158,37 +158,38 @@ void main() { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - - cat.makeSound(); + + cat.makeSound(); // ^^^ reference local 6 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - cat.sleep(); + cat.sleep(); // ^^^ reference local 6 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - dog.makeSound(); + + dog.makeSound(); // ^^^ reference local 7 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - dog.sleep(); + dog.sleep(); // ^^^ reference local 7 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - print(cat); + + print(cat); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 6 - print(dog); + print(dog); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 7 - print('The sum of $numbers is $sum'); + print('The sum of $numbers is $sum'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^ reference local 4 // ^^^ reference local 5 - - print(math.Rectangle(1, 2, 3, 4)); + + print(math.Rectangle(1, 2, 3, 4)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). -// ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# - - [1, 2].reduce((a, b) => a + b); +// ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/math. +// ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# + + [1, 2].reduce((a, b) => a + b); // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^ definition local 8 // documentation ```dart @@ -196,19 +197,20 @@ void main() { // documentation ```dart // ^ reference local 8 // ^ reference local 9 -} - -void test(String Function(int) p) {} + } + + void test(String Function(int) p) {} // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/test(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 10 // documentation ```dart -void deepTest(String Function(void Function(String test)) p) {} + void deepTest(String Function(void Function(String test)) p) {} // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/deepTest(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^ definition local 11 // documentation ```dart + diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index 10e8f8a8..76b4aa5c 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -1,58 +1,59 @@ -import 'more.dart' deferred as more; + import 'more.dart' deferred as more; // definition scip-dart pub dart_test 1.0.0 lib/other.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/more. // documentation ```dart - -class Foo { + + class Foo { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // documentation ```dart - int _far; + int _far; // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart - Foo(this._far); + Foo(this._far); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // ^^^^ reference local 0 // ^^^^ definition local 1 // documentation ```dart -} - -class Bar { + } + + class Bar { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // documentation ```dart - String _someValue; + String _someValue; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^ definition local 2 // documentation ```dart - Bar(this._someValue); + Bar(this._someValue); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^ reference local 2 // ^^^^^^^^^^ definition local 3 // documentation ```dart - - void someMethod() { + + void someMethod() { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). // documentation ```dart - _someValue = 'asdf'; + _someValue = 'asdf'; // ^^^^^^^^^^ reference local 2 - print(_someValue); + print(_someValue); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^^^^ reference local 2 + } } -} - -void main() { + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/main(). // documentation ```dart - more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); + more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/more. // ^^^^ reference scip-dart pub dart:async 3.1.0 dart:async/future.dart/Future#then(). // ^ definition local 4 // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). -} + } + diff --git a/snapshots/output/basic-project/test/basic_test.dart b/snapshots/output/basic-project/test/basic_test.dart index 554611cc..048a8dcd 100755 --- a/snapshots/output/basic-project/test/basic_test.dart +++ b/snapshots/output/basic-project/test/basic_test.dart @@ -1,15 +1,16 @@ -import 'package:test/test.dart'; + import 'package:test/test.dart'; // definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/ - -void main() { + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/main(). // documentation ```dart - group('some test', () { + group('some test', () { // ^^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/group(). - test('equality', () { + test('equality', () { // ^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/test(). - expect(1, 1); + expect(1, 1); // ^^^^^^ reference scip-dart pub matcher 0.12.16 lib/src/expect/expect.dart/expect(). + }); }); - }); -} + } + diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index a4255337..4966e134 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -1,4 +1,4 @@ -(String, int) userInfo(Map json) { + (String, int) userInfo(Map json) { // definition scip-dart pub dart3_features 1.0.0 lib/main.dart/ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# @@ -8,154 +8,155 @@ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition local 0 // documentation ```dart - return (json['name'] as String, json['height'] as int); + return (json['name'] as String, json['height'] as int); // ^^^^ reference local 0 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ reference local 0 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -} - -void parser(int charCode) { + } + + void parser(int charCode) { // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/parser(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 1 // documentation ```dart - const slash = 1; + const slash = 1; // ^^^^^ definition local 2 // documentation ```dart - const star = 2; + const star = 2; // ^^^^ definition local 3 // documentation ```dart - const plus = 3; + const plus = 3; // ^^^^ definition local 4 // documentation ```dart - const minus = 4; + const minus = 4; // ^^^^^ definition local 5 // documentation ```dart - - final nextCharCode = 'a'; + + final nextCharCode = 'a'; // ^^^^^^^^^^^^ definition local 6 // documentation ```dart - const digit0 = 0; + const digit0 = 0; // ^^^^^^ definition local 7 // documentation ```dart - const digit9 = 9; + const digit9 = 9; // ^^^^^^ definition local 8 // documentation ```dart - - void skipComment() {} + + void skipComment() {} // ^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). // documentation ```dart - void operatorFn(int charCode) {} + void operatorFn(int charCode) {} // ^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 9 // documentation ```dart - void number() {} + void number() {} // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). // documentation ```dart - void invalid() {} + void invalid() {} // ^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). // documentation ```dart - - switch (charCode) { + + switch (charCode) { // ^^^^^^^^ reference local 1 - case slash when nextCharCode == slash: + case slash when nextCharCode == slash: // ^^^^^ reference local 2 // ^^^^^^^^^^^^ reference local 6 // ^^^^^ reference local 2 - skipComment(); + skipComment(); // ^^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). - - case slash || star || plus || minus: + + case slash || star || plus || minus: // ^^^^^ reference local 2 // ^^^^ reference local 3 // ^^^^ reference local 4 // ^^^^^ reference local 5 - operatorFn(charCode); + operatorFn(charCode); // ^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // ^^^^^^^^ reference local 1 - - case >= digit0 && <= digit9: + + case >= digit0 && <= digit9: // ^^^^^^ reference local 7 // ^^^^^^ reference local 8 - number(); + number(); // ^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). - - default: - invalid(); + + default: + invalid(); // ^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). + } } -} - -const six = 6; + + const six = 6; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/six. // documentation ```dart -const msg = 'Feeling the Monday blues?'; + const msg = 'Feeling the Monday blues?'; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/msg. // documentation ```dart -String describeDate(DateTime dt) { + String describeDate(DateTime dt) { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/describeDate(). // documentation ```dart // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime# // ^^ definition local 10 // documentation ```dart - const one = 1; + const one = 1; // ^^^ definition local 11 // documentation ```dart - return switch (dt.weekday) { + return switch (dt.weekday) { // ^^ reference local 10 // ^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime#weekday. - one => 'Feeling the Monday blues?', + one => 'Feeling the Monday blues?', // ^^^ reference local 11 - 7 || six => 'Enjoy the weekend!', + 7 || six => 'Enjoy the weekend!', // ^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/six. - _ => 'Hang in there.' - }; -} - -void main() { + _ => 'Hang in there.' + }; + } + + void main() { // ^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/main(). // documentation ```dart - var ( - String name, + var ( + String name, // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# - int height, + int height, // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - ) = userInfo({'name': 'Michael', 'height': 180}); + ) = userInfo({'name': 'Michael', 'height': 180}); // ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). - print('User $name is $height cm tall.'); + print('User $name is $height cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^ reference local 12 // ^^^^^^ reference local 13 - - final json = {'name': 'Michael', 'height': 180}; + + final json = {'name': 'Michael', 'height': 180}; // ^^^^ definition local 14 // documentation ```dart - if (json case {'name': 'Michael', 'height': int h}) { + if (json case {'name': 'Michael', 'height': int h}) { // ^^^^ reference local 14 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - print('Michael is $h cm tall.'); + print('Michael is $h cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 15 + } } -} - -base class Foo {} + + base class Foo {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Foo# // documentation ```dart - -final class Bar {} + + final class Bar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Bar# // documentation ```dart - -interface class Car {} + + interface class Car {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Car# // documentation ```dart - -sealed class Zar {} + + sealed class Zar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Zar# // documentation ```dart + diff --git a/snapshots/output/relationships-project/lib/main.dart b/snapshots/output/relationships-project/lib/main.dart index 359d6c74..46991bf0 100755 --- a/snapshots/output/relationships-project/lib/main.dart +++ b/snapshots/output/relationships-project/lib/main.dart @@ -1,34 +1,34 @@ -abstract class Mammal { + abstract class Mammal { // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# // documentation ```dart - String get hierarchy; + String get hierarchy; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. // documentation ```dart -} - -abstract class Animal extends Mammal { + } + + abstract class Animal extends Mammal { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# - String sound() => 'NOISE!'; + String sound() => 'NOISE!'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). // documentation ```dart -} - -mixin SwimAction { + } + + mixin SwimAction { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# // documentation ```dart - void execute() => print('swimming...'); + void execute() => print('swimming...'); // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction#execute(). // documentation ```dart // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). -} - -class Dog extends Animal with SwimAction { + } + + class Dog extends Animal with SwimAction { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# implementation @@ -36,19 +36,20 @@ class Dog extends Animal with SwimAction { // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# - @override + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String sound() => 'woof'; + String sound() => 'woof'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#sound(). // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). implementation reference - - @override + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String get hierarchy => 'dog.animal.mammal'; + String get hierarchy => 'dog.animal.mammal'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#hierarchy. // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. implementation reference -} + } + From 98ee48b8afdbe31ccaa4af4ecde7833810ed25db Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Mon, 11 Sep 2023 09:23:03 -0700 Subject: [PATCH 20/27] fmt --- lib/src/scip_visitor.dart | 4 +- snapshots/output/basic-project/lib/main.dart | 95 ++++++------ snapshots/output/basic-project/lib/more.dart | 145 +++++++++--------- snapshots/output/basic-project/lib/other.dart | 39 +++-- .../output/basic-project/test/basic_test.dart | 17 +- snapshots/output/dart3-features/lib/main.dart | 127 ++++++++------- .../relationships-project/lib/main.dart | 39 +++-- 7 files changed, 229 insertions(+), 237 deletions(-) diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index 482d9154..4864efdf 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -147,9 +147,7 @@ class ScipVisitor extends GeneralizingAstVisitor { } void _visitTypeAnnotation(TypeAnnotation node) { - final element = node is NamedType - ? node.element - : node.type?.element; + final element = node is NamedType ? node.element : node.type?.element; if (element == null) return; var offset = node.offset; diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 78173a4b..79cb6cef 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -1,11 +1,11 @@ - import 'package:dart_test/other.dart'; +import 'package:dart_test/other.dart'; // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ - - /// This is a fib function - /// - /// Takes a number - /// Returns a number - int fib(int n) { + +/// This is a fib function +/// +/// Takes a number +/// Returns a number +int fib(int n) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // documentation ```dart @@ -13,96 +13,95 @@ // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart - if (n <= 1) return 0; + if (n <= 1) return 0; // ^ reference local 0 - return fib(n - 1) + fib(n - 2); + return fib(n - 1) + fib(n - 2); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 - } - - void print_fib(int a) { +} + +void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart - print(fib(a)); + print(fib(a)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 1 - } - - final y = 'Hello'; +} + +final y = 'Hello'; // ^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/y. // documentation ```dart - String capture() { +String capture() { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart - return y; + return y; // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. - } - - final capture_lambda = () => y; +} + +final capture_lambda = () => y; // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture_lambda. // documentation ```dart // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. - - void main() { + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/main(). // documentation ```dart - for (var i = 0; i <= 10; i++) {} + for (var i = 0; i <= 10; i++) {} // ^ definition local 2 // documentation ```dart // ^ reference local 2 // ^ reference local 2 - - for (var i in [1, 2, 3]) { + + for (var i in [1, 2, 3]) { // ^ definition local 3 // documentation ```dart - print(i); + print(i); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 3 - } - - var a = 0; + } + + var a = 0; // ^ definition local 4 // documentation ```dart - a = 1; + a = 1; // ^ reference local 4 - print_fib(a); + print_fib(a); // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // ^ reference local 4 - } - - void forever() { +} + +void forever() { // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). // documentation ```dart - return forever(); + return forever(); // ^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). - } - - class SomeLocalClass {} +} + +class SomeLocalClass {} // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# // documentation ```dart - - /// Reference parameter: [value] + +/// Reference parameter: [value] // ^^^^^ reference local 5 - /// Reference class: [SomeLocalClass] +/// Reference class: [SomeLocalClass] // ^^^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# - /// Reference external class: [Foo] +/// Reference external class: [Foo] // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# - /// Missing Reference: [IDontExist] - void someFunction(int value) { +/// Missing Reference: [IDontExist] +void someFunction(int value) { // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/someFunction(). // documentation ```dart // documentation Reference parameter: [value] // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^ definition local 5 // documentation ```dart - Foo(1); + Foo(1); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# - } - +} diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index b6dcafa4..9d2bb8c1 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -1,55 +1,55 @@ - import 'dart:math' as math; +import 'dart:math' as math; // definition scip-dart pub dart_test 1.0.0 lib/more.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/math. // documentation ```dart - - enum AnimalType { + +enum AnimalType { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // documentation ```dart - cat, + cat, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. // documentation ```dart - dog, + dog, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. // documentation ```dart - bird, + bird, // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. // documentation ```dart - } - - typedef SoundMaker = void Function(); +} + +typedef SoundMaker = void Function(); // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // documentation ```dart - - mixin SleepMixin { + +mixin SleepMixin { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# // documentation ```dart - void sleep() { + void sleep() { // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). // documentation ```dart - print('zzz...'); + print('zzz...'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - } } - - class Animal with SleepMixin { +} + +class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // documentation ```dart // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# - String name; + String name; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart - AnimalType type; + AnimalType type; // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // documentation ```dart - SoundMaker? soundMaker; + SoundMaker? soundMaker; // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // documentation ```dart - - Animal(this.name, {required this.type}) { + + Animal(this.name, {required this.type}) { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# @@ -59,56 +59,56 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // documentation ```dart - switch (type) { + switch (type) { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. - case AnimalType.cat: + case AnimalType.cat: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - soundMaker = () => print('Meow!'); + soundMaker = () => print('Meow!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.dog: + break; + case AnimalType.dog: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - soundMaker = () => print('Woof!'); + soundMaker = () => print('Woof!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.bird: + break; + case AnimalType.bird: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. - soundMaker = () => print('Chirp!'); + soundMaker = () => print('Chirp!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - default: - soundMaker = () => print('Unknown animal type'); + break; + default: + soundMaker = () => print('Unknown animal type'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - } } - - void makeSound() { + } + + void makeSound() { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). // documentation ```dart - soundMaker?.call(); + soundMaker?.call(); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. - } - - @override + } + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String toString() { + String toString() { // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart - return '$name the $type'; + return '$name the $type'; // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. - } } - - int calculateSum(List numbers) { +} + +int calculateSum(List numbers) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart @@ -116,7 +116,7 @@ // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart - return numbers.reduce((value, element) => value + element); + return numbers.reduce((value, element) => value + element); // ^^^^^^^ reference local 1 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^^^^^ definition local 2 @@ -125,24 +125,24 @@ // documentation ```dart // ^^^^^ reference local 2 // ^^^^^^^ reference local 3 - } - - void main() { +} + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart - List numbers = [1, 2, 3, 4, 5]; + List numbers = [1, 2, 3, 4, 5]; // ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart - int sum = calculateSum(numbers); + int sum = calculateSum(numbers); // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition local 5 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // ^^^^^^^ reference local 4 - - Animal cat = Animal('Kitty', type: AnimalType.cat); + + Animal cat = Animal('Kitty', type: AnimalType.cat); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 6 // documentation ```dart @@ -150,7 +150,7 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - Animal dog = Animal('Buddy', type: AnimalType.dog); + Animal dog = Animal('Buddy', type: AnimalType.dog); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 7 // documentation ```dart @@ -158,38 +158,38 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - - cat.makeSound(); + + cat.makeSound(); // ^^^ reference local 6 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - cat.sleep(); + cat.sleep(); // ^^^ reference local 6 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - dog.makeSound(); + + dog.makeSound(); // ^^^ reference local 7 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - dog.sleep(); + dog.sleep(); // ^^^ reference local 7 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - print(cat); + + print(cat); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 6 - print(dog); + print(dog); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 7 - print('The sum of $numbers is $sum'); + print('The sum of $numbers is $sum'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^ reference local 4 // ^^^ reference local 5 - - print(math.Rectangle(1, 2, 3, 4)); + + print(math.Rectangle(1, 2, 3, 4)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/math. // ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# - - [1, 2].reduce((a, b) => a + b); + + [1, 2].reduce((a, b) => a + b); // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^ definition local 8 // documentation ```dart @@ -197,20 +197,19 @@ // documentation ```dart // ^ reference local 8 // ^ reference local 9 - } - - void test(String Function(int) p) {} +} + +void test(String Function(int) p) {} // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/test(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 10 // documentation ```dart - void deepTest(String Function(void Function(String test)) p) {} +void deepTest(String Function(void Function(String test)) p) {} // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/deepTest(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^ definition local 11 // documentation ```dart - diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index 76b4aa5c..10e8f8a8 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -1,59 +1,58 @@ - import 'more.dart' deferred as more; +import 'more.dart' deferred as more; // definition scip-dart pub dart_test 1.0.0 lib/other.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/more. // documentation ```dart - - class Foo { + +class Foo { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // documentation ```dart - int _far; + int _far; // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart - Foo(this._far); + Foo(this._far); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // ^^^^ reference local 0 // ^^^^ definition local 1 // documentation ```dart - } - - class Bar { +} + +class Bar { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // documentation ```dart - String _someValue; + String _someValue; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^ definition local 2 // documentation ```dart - Bar(this._someValue); + Bar(this._someValue); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^ reference local 2 // ^^^^^^^^^^ definition local 3 // documentation ```dart - - void someMethod() { + + void someMethod() { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). // documentation ```dart - _someValue = 'asdf'; + _someValue = 'asdf'; // ^^^^^^^^^^ reference local 2 - print(_someValue); + print(_someValue); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^^^^ reference local 2 - } } - - void main() { +} + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/main(). // documentation ```dart - more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); + more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/more. // ^^^^ reference scip-dart pub dart:async 3.1.0 dart:async/future.dart/Future#then(). // ^ definition local 4 // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). - } - +} diff --git a/snapshots/output/basic-project/test/basic_test.dart b/snapshots/output/basic-project/test/basic_test.dart index 048a8dcd..554611cc 100755 --- a/snapshots/output/basic-project/test/basic_test.dart +++ b/snapshots/output/basic-project/test/basic_test.dart @@ -1,16 +1,15 @@ - import 'package:test/test.dart'; +import 'package:test/test.dart'; // definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/ - - void main() { + +void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/main(). // documentation ```dart - group('some test', () { + group('some test', () { // ^^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/group(). - test('equality', () { + test('equality', () { // ^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/test(). - expect(1, 1); + expect(1, 1); // ^^^^^^ reference scip-dart pub matcher 0.12.16 lib/src/expect/expect.dart/expect(). - }); }); - } - + }); +} diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index 4966e134..a4255337 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -1,4 +1,4 @@ - (String, int) userInfo(Map json) { +(String, int) userInfo(Map json) { // definition scip-dart pub dart3_features 1.0.0 lib/main.dart/ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# @@ -8,155 +8,154 @@ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition local 0 // documentation ```dart - return (json['name'] as String, json['height'] as int); + return (json['name'] as String, json['height'] as int); // ^^^^ reference local 0 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ reference local 0 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - } - - void parser(int charCode) { +} + +void parser(int charCode) { // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/parser(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 1 // documentation ```dart - const slash = 1; + const slash = 1; // ^^^^^ definition local 2 // documentation ```dart - const star = 2; + const star = 2; // ^^^^ definition local 3 // documentation ```dart - const plus = 3; + const plus = 3; // ^^^^ definition local 4 // documentation ```dart - const minus = 4; + const minus = 4; // ^^^^^ definition local 5 // documentation ```dart - - final nextCharCode = 'a'; + + final nextCharCode = 'a'; // ^^^^^^^^^^^^ definition local 6 // documentation ```dart - const digit0 = 0; + const digit0 = 0; // ^^^^^^ definition local 7 // documentation ```dart - const digit9 = 9; + const digit9 = 9; // ^^^^^^ definition local 8 // documentation ```dart - - void skipComment() {} + + void skipComment() {} // ^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). // documentation ```dart - void operatorFn(int charCode) {} + void operatorFn(int charCode) {} // ^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 9 // documentation ```dart - void number() {} + void number() {} // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). // documentation ```dart - void invalid() {} + void invalid() {} // ^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). // documentation ```dart - - switch (charCode) { + + switch (charCode) { // ^^^^^^^^ reference local 1 - case slash when nextCharCode == slash: + case slash when nextCharCode == slash: // ^^^^^ reference local 2 // ^^^^^^^^^^^^ reference local 6 // ^^^^^ reference local 2 - skipComment(); + skipComment(); // ^^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). - - case slash || star || plus || minus: + + case slash || star || plus || minus: // ^^^^^ reference local 2 // ^^^^ reference local 3 // ^^^^ reference local 4 // ^^^^^ reference local 5 - operatorFn(charCode); + operatorFn(charCode); // ^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // ^^^^^^^^ reference local 1 - - case >= digit0 && <= digit9: + + case >= digit0 && <= digit9: // ^^^^^^ reference local 7 // ^^^^^^ reference local 8 - number(); + number(); // ^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). - - default: - invalid(); + + default: + invalid(); // ^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). - } } - - const six = 6; +} + +const six = 6; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/six. // documentation ```dart - const msg = 'Feeling the Monday blues?'; +const msg = 'Feeling the Monday blues?'; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/msg. // documentation ```dart - String describeDate(DateTime dt) { +String describeDate(DateTime dt) { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/describeDate(). // documentation ```dart // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime# // ^^ definition local 10 // documentation ```dart - const one = 1; + const one = 1; // ^^^ definition local 11 // documentation ```dart - return switch (dt.weekday) { + return switch (dt.weekday) { // ^^ reference local 10 // ^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime#weekday. - one => 'Feeling the Monday blues?', + one => 'Feeling the Monday blues?', // ^^^ reference local 11 - 7 || six => 'Enjoy the weekend!', + 7 || six => 'Enjoy the weekend!', // ^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/six. - _ => 'Hang in there.' - }; - } - - void main() { + _ => 'Hang in there.' + }; +} + +void main() { // ^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/main(). // documentation ```dart - var ( - String name, + var ( + String name, // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# - int height, + int height, // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - ) = userInfo({'name': 'Michael', 'height': 180}); + ) = userInfo({'name': 'Michael', 'height': 180}); // ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). - print('User $name is $height cm tall.'); + print('User $name is $height cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^ reference local 12 // ^^^^^^ reference local 13 - - final json = {'name': 'Michael', 'height': 180}; + + final json = {'name': 'Michael', 'height': 180}; // ^^^^ definition local 14 // documentation ```dart - if (json case {'name': 'Michael', 'height': int h}) { + if (json case {'name': 'Michael', 'height': int h}) { // ^^^^ reference local 14 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - print('Michael is $h cm tall.'); + print('Michael is $h cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 15 - } } - - base class Foo {} +} + +base class Foo {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Foo# // documentation ```dart - - final class Bar {} + +final class Bar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Bar# // documentation ```dart - - interface class Car {} + +interface class Car {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Car# // documentation ```dart - - sealed class Zar {} + +sealed class Zar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Zar# // documentation ```dart - diff --git a/snapshots/output/relationships-project/lib/main.dart b/snapshots/output/relationships-project/lib/main.dart index 46991bf0..359d6c74 100755 --- a/snapshots/output/relationships-project/lib/main.dart +++ b/snapshots/output/relationships-project/lib/main.dart @@ -1,34 +1,34 @@ - abstract class Mammal { +abstract class Mammal { // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# // documentation ```dart - String get hierarchy; + String get hierarchy; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. // documentation ```dart - } - - abstract class Animal extends Mammal { +} + +abstract class Animal extends Mammal { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# - String sound() => 'NOISE!'; + String sound() => 'NOISE!'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). // documentation ```dart - } - - mixin SwimAction { +} + +mixin SwimAction { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# // documentation ```dart - void execute() => print('swimming...'); + void execute() => print('swimming...'); // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction#execute(). // documentation ```dart // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - } - - class Dog extends Animal with SwimAction { +} + +class Dog extends Animal with SwimAction { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# implementation @@ -36,20 +36,19 @@ // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# - @override + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String sound() => 'woof'; + String sound() => 'woof'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#sound(). // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). implementation reference - - @override + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String get hierarchy => 'dog.animal.mammal'; + String get hierarchy => 'dog.animal.mammal'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#hierarchy. // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. implementation reference - } - +} From 06e02796013caeda5eebae38780d3f3534780ddc Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Mon, 11 Sep 2023 09:25:39 -0700 Subject: [PATCH 21/27] regen --- snapshots/output/basic-project/lib/main.dart | 95 ++++++------ snapshots/output/basic-project/lib/more.dart | 145 +++++++++--------- snapshots/output/basic-project/lib/other.dart | 39 ++--- .../output/basic-project/test/basic_test.dart | 17 +- snapshots/output/dart3-features/lib/main.dart | 127 +++++++-------- .../relationships-project/lib/main.dart | 39 ++--- 6 files changed, 234 insertions(+), 228 deletions(-) diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 79cb6cef..78173a4b 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -1,11 +1,11 @@ -import 'package:dart_test/other.dart'; + import 'package:dart_test/other.dart'; // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ - -/// This is a fib function -/// -/// Takes a number -/// Returns a number -int fib(int n) { + + /// This is a fib function + /// + /// Takes a number + /// Returns a number + int fib(int n) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // documentation ```dart @@ -13,95 +13,96 @@ int fib(int n) { // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart - if (n <= 1) return 0; + if (n <= 1) return 0; // ^ reference local 0 - return fib(n - 1) + fib(n - 2); + return fib(n - 1) + fib(n - 2); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 0 -} - -void print_fib(int a) { + } + + void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart - print(fib(a)); + print(fib(a)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 1 -} - -final y = 'Hello'; + } + + final y = 'Hello'; // ^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/y. // documentation ```dart -String capture() { + String capture() { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart - return y; + return y; // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. -} - -final capture_lambda = () => y; + } + + final capture_lambda = () => y; // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture_lambda. // documentation ```dart // ^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/y. - -void main() { + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/main(). // documentation ```dart - for (var i = 0; i <= 10; i++) {} + for (var i = 0; i <= 10; i++) {} // ^ definition local 2 // documentation ```dart // ^ reference local 2 // ^ reference local 2 - - for (var i in [1, 2, 3]) { + + for (var i in [1, 2, 3]) { // ^ definition local 3 // documentation ```dart - print(i); + print(i); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 3 - } - - var a = 0; + } + + var a = 0; // ^ definition local 4 // documentation ```dart - a = 1; + a = 1; // ^ reference local 4 - print_fib(a); + print_fib(a); // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/print_fib(). // ^ reference local 4 -} - -void forever() { + } + + void forever() { // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). // documentation ```dart - return forever(); + return forever(); // ^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/forever(). -} - -class SomeLocalClass {} + } + + class SomeLocalClass {} // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# // documentation ```dart - -/// Reference parameter: [value] + + /// Reference parameter: [value] // ^^^^^ reference local 5 -/// Reference class: [SomeLocalClass] + /// Reference class: [SomeLocalClass] // ^^^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SomeLocalClass# -/// Reference external class: [Foo] + /// Reference external class: [Foo] // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# -/// Missing Reference: [IDontExist] -void someFunction(int value) { + /// Missing Reference: [IDontExist] + void someFunction(int value) { // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/someFunction(). // documentation ```dart // documentation Reference parameter: [value] // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^ definition local 5 // documentation ```dart - Foo(1); + Foo(1); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# -} + } + diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index 9d2bb8c1..b6dcafa4 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -1,55 +1,55 @@ -import 'dart:math' as math; + import 'dart:math' as math; // definition scip-dart pub dart_test 1.0.0 lib/more.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/math. // documentation ```dart - -enum AnimalType { + + enum AnimalType { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // documentation ```dart - cat, + cat, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. // documentation ```dart - dog, + dog, // ^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. // documentation ```dart - bird, + bird, // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. // documentation ```dart -} - -typedef SoundMaker = void Function(); + } + + typedef SoundMaker = void Function(); // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // documentation ```dart - -mixin SleepMixin { + + mixin SleepMixin { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# // documentation ```dart - void sleep() { + void sleep() { // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). // documentation ```dart - print('zzz...'); + print('zzz...'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). + } } -} - -class Animal with SleepMixin { + + class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // documentation ```dart // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin# - String name; + String name; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart - AnimalType type; + AnimalType type; // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // documentation ```dart - SoundMaker? soundMaker; + SoundMaker? soundMaker; // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SoundMaker# // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // documentation ```dart - - Animal(this.name, {required this.type}) { + + Animal(this.name, {required this.type}) { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# @@ -59,56 +59,56 @@ class Animal with SleepMixin { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // documentation ```dart - switch (type) { + switch (type) { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. - case AnimalType.cat: + case AnimalType.cat: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - soundMaker = () => print('Meow!'); + soundMaker = () => print('Meow!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.dog: + break; + case AnimalType.dog: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - soundMaker = () => print('Woof!'); + soundMaker = () => print('Woof!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - case AnimalType.bird: + break; + case AnimalType.bird: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#bird. - soundMaker = () => print('Chirp!'); + soundMaker = () => print('Chirp!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). - break; - default: - soundMaker = () => print('Unknown animal type'); + break; + default: + soundMaker = () => print('Unknown animal type'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). + } } - } - - void makeSound() { + + void makeSound() { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). // documentation ```dart - soundMaker?.call(); + soundMaker?.call(); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#soundMaker. - } - - @override + } + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String toString() { + String toString() { // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#toString(). // documentation ```dart - return '$name the $type'; + return '$name the $type'; // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#type. + } } -} - -int calculateSum(List numbers) { + + int calculateSum(List numbers) { //^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // documentation ```dart @@ -116,7 +116,7 @@ int calculateSum(List numbers) { // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 1 // documentation ```dart - return numbers.reduce((value, element) => value + element); + return numbers.reduce((value, element) => value + element); // ^^^^^^^ reference local 1 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^^^^^ definition local 2 @@ -125,24 +125,24 @@ int calculateSum(List numbers) { // documentation ```dart // ^^^^^ reference local 2 // ^^^^^^^ reference local 3 -} - -void main() { + } + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/main(). // documentation ```dart - List numbers = [1, 2, 3, 4, 5]; + List numbers = [1, 2, 3, 4, 5]; // ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/list.dart/List# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^ definition local 4 // documentation ```dart - int sum = calculateSum(numbers); + int sum = calculateSum(numbers); // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^ definition local 5 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). // ^^^^^^^ reference local 4 - - Animal cat = Animal('Kitty', type: AnimalType.cat); + + Animal cat = Animal('Kitty', type: AnimalType.cat); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 6 // documentation ```dart @@ -150,7 +150,7 @@ void main() { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#cat. - Animal dog = Animal('Buddy', type: AnimalType.dog); + Animal dog = Animal('Buddy', type: AnimalType.dog); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal# // ^^^ definition local 7 // documentation ```dart @@ -158,38 +158,38 @@ void main() { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/AnimalType#dog. - - cat.makeSound(); + + cat.makeSound(); // ^^^ reference local 6 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - cat.sleep(); + cat.sleep(); // ^^^ reference local 6 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - dog.makeSound(); + + dog.makeSound(); // ^^^ reference local 7 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#makeSound(). - dog.sleep(); + dog.sleep(); // ^^^ reference local 7 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/SleepMixin#sleep(). - - print(cat); + + print(cat); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 6 - print(dog); + print(dog); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^ reference local 7 - print('The sum of $numbers is $sum'); + print('The sum of $numbers is $sum'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^ reference local 4 // ^^^ reference local 5 - - print(math.Rectangle(1, 2, 3, 4)); + + print(math.Rectangle(1, 2, 3, 4)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/math. // ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# - - [1, 2].reduce((a, b) => a + b); + + [1, 2].reduce((a, b) => a + b); // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). // ^ definition local 8 // documentation ```dart @@ -197,19 +197,20 @@ void main() { // documentation ```dart // ^ reference local 8 // ^ reference local 9 -} - -void test(String Function(int) p) {} + } + + void test(String Function(int) p) {} // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/test(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^ definition local 10 // documentation ```dart -void deepTest(String Function(void Function(String test)) p) {} + void deepTest(String Function(void Function(String test)) p) {} // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/deepTest(). // documentation ```dart // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^ definition local 11 // documentation ```dart + diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index 10e8f8a8..76b4aa5c 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -1,58 +1,59 @@ -import 'more.dart' deferred as more; + import 'more.dart' deferred as more; // definition scip-dart pub dart_test 1.0.0 lib/other.dart/ // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/more. // documentation ```dart - -class Foo { + + class Foo { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // documentation ```dart - int _far; + int _far; // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart - Foo(this._far); + Foo(this._far); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# // ^^^^ reference local 0 // ^^^^ definition local 1 // documentation ```dart -} - -class Bar { + } + + class Bar { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // documentation ```dart - String _someValue; + String _someValue; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^ definition local 2 // documentation ```dart - Bar(this._someValue); + Bar(this._someValue); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#(). // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^ reference local 2 // ^^^^^^^^^^ definition local 3 // documentation ```dart - - void someMethod() { + + void someMethod() { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). // documentation ```dart - _someValue = 'asdf'; + _someValue = 'asdf'; // ^^^^^^^^^^ reference local 2 - print(_someValue); + print(_someValue); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^^^^^^^ reference local 2 + } } -} - -void main() { + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/main(). // documentation ```dart - more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); + more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/more. // ^^^^ reference scip-dart pub dart:async 3.1.0 dart:async/future.dart/Future#then(). // ^ definition local 4 // documentation ```dart // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). -} + } + diff --git a/snapshots/output/basic-project/test/basic_test.dart b/snapshots/output/basic-project/test/basic_test.dart index 554611cc..048a8dcd 100755 --- a/snapshots/output/basic-project/test/basic_test.dart +++ b/snapshots/output/basic-project/test/basic_test.dart @@ -1,15 +1,16 @@ -import 'package:test/test.dart'; + import 'package:test/test.dart'; // definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/ - -void main() { + + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 test/basic_test.dart/main(). // documentation ```dart - group('some test', () { + group('some test', () { // ^^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/group(). - test('equality', () { + test('equality', () { // ^^^^ reference scip-dart pub test_core 0.5.3 lib/scaffolding.dart/test(). - expect(1, 1); + expect(1, 1); // ^^^^^^ reference scip-dart pub matcher 0.12.16 lib/src/expect/expect.dart/expect(). + }); }); - }); -} + } + diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index a4255337..4966e134 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -1,4 +1,4 @@ -(String, int) userInfo(Map json) { + (String, int) userInfo(Map json) { // definition scip-dart pub dart3_features 1.0.0 lib/main.dart/ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# @@ -8,154 +8,155 @@ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ definition local 0 // documentation ```dart - return (json['name'] as String, json['height'] as int); + return (json['name'] as String, json['height'] as int); // ^^^^ reference local 0 // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^ reference local 0 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# -} - -void parser(int charCode) { + } + + void parser(int charCode) { // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/parser(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 1 // documentation ```dart - const slash = 1; + const slash = 1; // ^^^^^ definition local 2 // documentation ```dart - const star = 2; + const star = 2; // ^^^^ definition local 3 // documentation ```dart - const plus = 3; + const plus = 3; // ^^^^ definition local 4 // documentation ```dart - const minus = 4; + const minus = 4; // ^^^^^ definition local 5 // documentation ```dart - - final nextCharCode = 'a'; + + final nextCharCode = 'a'; // ^^^^^^^^^^^^ definition local 6 // documentation ```dart - const digit0 = 0; + const digit0 = 0; // ^^^^^^ definition local 7 // documentation ```dart - const digit9 = 9; + const digit9 = 9; // ^^^^^^ definition local 8 // documentation ```dart - - void skipComment() {} + + void skipComment() {} // ^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). // documentation ```dart - void operatorFn(int charCode) {} + void operatorFn(int charCode) {} // ^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // documentation ```dart // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# // ^^^^^^^^ definition local 9 // documentation ```dart - void number() {} + void number() {} // ^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). // documentation ```dart - void invalid() {} + void invalid() {} // ^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). // documentation ```dart - - switch (charCode) { + + switch (charCode) { // ^^^^^^^^ reference local 1 - case slash when nextCharCode == slash: + case slash when nextCharCode == slash: // ^^^^^ reference local 2 // ^^^^^^^^^^^^ reference local 6 // ^^^^^ reference local 2 - skipComment(); + skipComment(); // ^^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/skipComment(). - - case slash || star || plus || minus: + + case slash || star || plus || minus: // ^^^^^ reference local 2 // ^^^^ reference local 3 // ^^^^ reference local 4 // ^^^^^ reference local 5 - operatorFn(charCode); + operatorFn(charCode); // ^^^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/operatorFn(). // ^^^^^^^^ reference local 1 - - case >= digit0 && <= digit9: + + case >= digit0 && <= digit9: // ^^^^^^ reference local 7 // ^^^^^^ reference local 8 - number(); + number(); // ^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/number(). - - default: - invalid(); + + default: + invalid(); // ^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/invalid(). + } } -} - -const six = 6; + + const six = 6; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/six. // documentation ```dart -const msg = 'Feeling the Monday blues?'; + const msg = 'Feeling the Monday blues?'; // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/msg. // documentation ```dart -String describeDate(DateTime dt) { + String describeDate(DateTime dt) { //^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/describeDate(). // documentation ```dart // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime# // ^^ definition local 10 // documentation ```dart - const one = 1; + const one = 1; // ^^^ definition local 11 // documentation ```dart - return switch (dt.weekday) { + return switch (dt.weekday) { // ^^ reference local 10 // ^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/date_time.dart/DateTime#weekday. - one => 'Feeling the Monday blues?', + one => 'Feeling the Monday blues?', // ^^^ reference local 11 - 7 || six => 'Enjoy the weekend!', + 7 || six => 'Enjoy the weekend!', // ^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/six. - _ => 'Hang in there.' - }; -} - -void main() { + _ => 'Hang in there.' + }; + } + + void main() { // ^^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/main(). // documentation ```dart - var ( - String name, + var ( + String name, // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# - int height, + int height, // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - ) = userInfo({'name': 'Michael', 'height': 180}); + ) = userInfo({'name': 'Michael', 'height': 180}); // ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). - print('User $name is $height cm tall.'); + print('User $name is $height cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^ reference local 12 // ^^^^^^ reference local 13 - - final json = {'name': 'Michael', 'height': 180}; + + final json = {'name': 'Michael', 'height': 180}; // ^^^^ definition local 14 // documentation ```dart - if (json case {'name': 'Michael', 'height': int h}) { + if (json case {'name': 'Michael', 'height': int h}) { // ^^^^ reference local 14 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# - print('Michael is $h cm tall.'); + print('Michael is $h cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 15 + } } -} - -base class Foo {} + + base class Foo {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Foo# // documentation ```dart - -final class Bar {} + + final class Bar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Bar# // documentation ```dart - -interface class Car {} + + interface class Car {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Car# // documentation ```dart - -sealed class Zar {} + + sealed class Zar {} // ^^^ definition scip-dart pub dart3_features 1.0.0 lib/main.dart/Zar# // documentation ```dart + diff --git a/snapshots/output/relationships-project/lib/main.dart b/snapshots/output/relationships-project/lib/main.dart index 359d6c74..46991bf0 100755 --- a/snapshots/output/relationships-project/lib/main.dart +++ b/snapshots/output/relationships-project/lib/main.dart @@ -1,34 +1,34 @@ -abstract class Mammal { + abstract class Mammal { // definition scip-dart pub dart_test 1.0.0 lib/main.dart/ // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# // documentation ```dart - String get hierarchy; + String get hierarchy; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. // documentation ```dart -} - -abstract class Animal extends Mammal { + } + + abstract class Animal extends Mammal { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal# - String sound() => 'NOISE!'; + String sound() => 'NOISE!'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). // documentation ```dart -} - -mixin SwimAction { + } + + mixin SwimAction { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# // documentation ```dart - void execute() => print('swimming...'); + void execute() => print('swimming...'); // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction#execute(). // documentation ```dart // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). -} - -class Dog extends Animal with SwimAction { + } + + class Dog extends Animal with SwimAction { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog# // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# implementation @@ -36,19 +36,20 @@ class Dog extends Animal with SwimAction { // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/Animal# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/SwimAction# - @override + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String sound() => 'woof'; + String sound() => 'woof'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#sound(). // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Animal#sound(). implementation reference - - @override + + @override // ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/annotations.dart/override. - String get hierarchy => 'dog.animal.mammal'; + String get hierarchy => 'dog.animal.mammal'; // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/Dog#hierarchy. // documentation ```dart // relationship scip-dart pub dart_test 1.0.0 lib/main.dart/Mammal#hierarchy. implementation reference -} + } + From 213dee1d7f84d14fa7f6e8413819c4d30e621c6c Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Mon, 11 Sep 2023 09:29:33 -0700 Subject: [PATCH 22/27] un-format scip snaps --- snapshots/input/basic-project/lib/main.dart | 2 +- snapshots/input/basic-project/lib/more.dart | 6 +++--- snapshots/input/basic-project/lib/other.dart | 6 ++++-- .../input/basic-project/test/basic_test.dart | 2 +- snapshots/output/basic-project/lib/main.dart | 1 - snapshots/output/basic-project/lib/more.dart | 19 +++++++++---------- snapshots/output/basic-project/lib/other.dart | 9 +++++---- .../output/basic-project/test/basic_test.dart | 1 - 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/snapshots/input/basic-project/lib/main.dart b/snapshots/input/basic-project/lib/main.dart index 2277304d..cbb519c9 100644 --- a/snapshots/input/basic-project/lib/main.dart +++ b/snapshots/input/basic-project/lib/main.dart @@ -44,4 +44,4 @@ class SomeLocalClass {} /// Missing Reference: [IDontExist] void someFunction(int value) { Foo(1); -} +} \ No newline at end of file diff --git a/snapshots/input/basic-project/lib/more.dart b/snapshots/input/basic-project/lib/more.dart index 114dbed7..7b57fcde 100644 --- a/snapshots/input/basic-project/lib/more.dart +++ b/snapshots/input/basic-project/lib/more.dart @@ -66,10 +66,10 @@ void main() { print(dog); print('The sum of $numbers is $sum'); - print(math.Rectangle(1, 2, 3, 4)); + print(math.Rectangle(1,2,3,4)); - [1, 2].reduce((a, b) => a + b); + [1,2].reduce((a, b) => a + b); } void test(String Function(int) p) {} -void deepTest(String Function(void Function(String test)) p) {} +void deepTest(String Function(void Function(String test)) p) {} \ No newline at end of file diff --git a/snapshots/input/basic-project/lib/other.dart b/snapshots/input/basic-project/lib/other.dart index 6b2373c2..fb31e52b 100644 --- a/snapshots/input/basic-project/lib/other.dart +++ b/snapshots/input/basic-project/lib/other.dart @@ -16,5 +16,7 @@ class Bar { } void main() { - more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); -} + more.loadLibrary().then((_) => { + Bar('a').someMethod.call() + }); +} \ No newline at end of file diff --git a/snapshots/input/basic-project/test/basic_test.dart b/snapshots/input/basic-project/test/basic_test.dart index cda44fb2..35ddd9ba 100644 --- a/snapshots/input/basic-project/test/basic_test.dart +++ b/snapshots/input/basic-project/test/basic_test.dart @@ -6,4 +6,4 @@ void main() { expect(1, 1); }); }); -} +} \ No newline at end of file diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 78173a4b..d90b5b2e 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -105,4 +105,3 @@ Foo(1); // ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo# } - diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index b6dcafa4..1c2d199e 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -184,19 +184,19 @@ // ^^^^^^^ reference local 4 // ^^^ reference local 5 - print(math.Rectangle(1, 2, 3, 4)); + print(math.Rectangle(1,2,3,4)); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/math. // ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/rectangle.dart/Rectangle# - [1, 2].reduce((a, b) => a + b); -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). -// ^ definition local 8 -// documentation ```dart -// ^ definition local 9 -// documentation ```dart -// ^ reference local 8 -// ^ reference local 9 + [1,2].reduce((a, b) => a + b); +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/iterable.dart/Iterable#reduce(). +// ^ definition local 8 +// documentation ```dart +// ^ definition local 9 +// documentation ```dart +// ^ reference local 8 +// ^ reference local 9 } void test(String Function(int) p) {} @@ -213,4 +213,3 @@ // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^ definition local 11 // documentation ```dart - diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index 76b4aa5c..dc13b506 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -48,12 +48,13 @@ void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/main(). // documentation ```dart - more.loadLibrary().then((_) => {Bar('a').someMethod.call()}); + more.loadLibrary().then((_) => { // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/more. // ^^^^ reference scip-dart pub dart:async 3.1.0 dart:async/future.dart/Future#then(). // ^ definition local 4 // documentation ```dart -// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# -// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). + Bar('a').someMethod.call() +// ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar# +// ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod(). + }); } - diff --git a/snapshots/output/basic-project/test/basic_test.dart b/snapshots/output/basic-project/test/basic_test.dart index 048a8dcd..a7506aae 100755 --- a/snapshots/output/basic-project/test/basic_test.dart +++ b/snapshots/output/basic-project/test/basic_test.dart @@ -13,4 +13,3 @@ }); }); } - From a0cc46809e4a77ae0a4cb878b473a963076fc46d Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Thu, 28 Sep 2023 12:10:08 -0600 Subject: [PATCH 23/27] re-pug retreived --- pubspec.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.lock b/pubspec.lock index 50972a1a..8a602568 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -42,7 +42,7 @@ packages: source: hosted version: "1.1.1" chalk: - dependency: "direct main" + dependency: "direct dev" description: name: chalk sha256: "53491e94aea65cddf07a63491384cd2018c1ccf188c973dbb935fbee9db609c8" From 9988a0df25a8a3f34e85f7effdf27540393155dc Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Thu, 28 Sep 2023 12:14:10 -0600 Subject: [PATCH 24/27] regen --- snapshots/output/basic-project/lib/other.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index 45d102eb..caba0787 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -11,15 +11,15 @@ // ^^^^ definition local 0 // documentation ```dart bool value; -// ^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/bool.dart/bool# +// ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/bool.dart/bool# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value. // documentation ```dart String value2; -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value2. // documentation ```dart double value3; -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/double.dart/double# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/double.dart/double# // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value3. // documentation ```dart Foo(this._far); From c1a887e99b4c0fdca17a636ec85951be55604b2c Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Thu, 28 Sep 2023 12:28:42 -0600 Subject: [PATCH 25/27] regen snaps --- lib/src/scip_visitor.dart | 9 +++++++++ snapshots/input/staging-project/.vscode/settings.json | 3 +++ snapshots/input/staging-project/pubspec.lock | 2 +- snapshots/input/staging-project/pubspec.yaml | 2 +- snapshots/output/dart3-features/lib/main.dart | 6 ++++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 snapshots/input/staging-project/.vscode/settings.json diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index f0fe1fa0..651bd3b2 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -58,6 +58,8 @@ class ScipVisitor extends GeneralizingAstVisitor { _visitTypeAnnotation(node); } else if (node is ImportPrefixReference) { _visitImportPrefixReference(node); + } else if (node is DeclaredVariablePattern) { + _visitPatternField(node); } super.visitNode(node); @@ -176,6 +178,13 @@ class ScipVisitor extends GeneralizingAstVisitor { ); } + void _visitPatternField(DeclaredVariablePattern node) { + final element = node.declaredElement; + if (element == null) return; + + _registerAsDefinition(element); + } + /// Registers the provided [element] as a reference to an existing definition /// /// [node] refers to the ast node where the reference exists, [element] diff --git a/snapshots/input/staging-project/.vscode/settings.json b/snapshots/input/staging-project/.vscode/settings.json new file mode 100644 index 00000000..34a6c636 --- /dev/null +++ b/snapshots/input/staging-project/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "dart.sdkPath": "~/.asdf/installs/dart/3.1.0/dart-sdk" +} \ No newline at end of file diff --git a/snapshots/input/staging-project/pubspec.lock b/snapshots/input/staging-project/pubspec.lock index 62ac150b..573410f7 100644 --- a/snapshots/input/staging-project/pubspec.lock +++ b/snapshots/input/staging-project/pubspec.lock @@ -2,4 +2,4 @@ # See https://dart.dev/tools/pub/glossary#lockfile packages: {} sdks: - dart: ">=2.18.0 <4.0.0" + dart: ">=3.0.0 <4.0.0" diff --git a/snapshots/input/staging-project/pubspec.yaml b/snapshots/input/staging-project/pubspec.yaml index 01372323..8ff77ffb 100644 --- a/snapshots/input/staging-project/pubspec.yaml +++ b/snapshots/input/staging-project/pubspec.yaml @@ -2,4 +2,4 @@ name: dart_test version: 1.0.0 environment: - sdk: ">=2.18.0 <3.0.0" + sdk: ">=3.0.0 <4.0.0" diff --git a/snapshots/output/dart3-features/lib/main.dart b/snapshots/output/dart3-features/lib/main.dart index 4966e134..1a5f4b97 100755 --- a/snapshots/output/dart3-features/lib/main.dart +++ b/snapshots/output/dart3-features/lib/main.dart @@ -123,8 +123,12 @@ var ( String name, // ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^ definition local 12 +// documentation ```dart int height, // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^^^^ definition local 13 +// documentation ```dart ) = userInfo({'name': 'Michael', 'height': 180}); // ^^^^^^^^ reference scip-dart pub dart3_features 1.0.0 lib/main.dart/userInfo(). print('User $name is $height cm tall.'); @@ -138,6 +142,8 @@ if (json case {'name': 'Michael', 'height': int h}) { // ^^^^ reference local 14 // ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^ definition local 15 +// documentation ```dart print('Michael is $h cm tall.'); // ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). // ^ reference local 15 From f56d424d53d0e05124dd897afec8d72c184e400b Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Thu, 28 Sep 2023 12:31:17 -0600 Subject: [PATCH 26/27] scoped format --- .github/workflows/checks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index fd90b5f9..9be717f8 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -22,7 +22,7 @@ jobs: with: sdk: 3.1.0 - run: dart pub get - - run: dart format --set-exit-if-changed . + - run: dart format --set-exit-if-changed lib bin dependency-validator: runs-on: ubuntu-latest From 4321d004a8e7d636d2edbff34e69fdcc16d1fbfe Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Sun, 28 Jan 2024 15:57:45 -0700 Subject: [PATCH 27/27] merged master --- lib/src/scip_visitor.dart | 4 +- pubspec.lock | 268 ++---------------- pubspec.yaml | 1 - snapshots/input/diagnostics/pubspec.lock | 2 +- snapshots/output/basic-project/lib/main.dart | 34 +-- snapshots/output/basic-project/lib/more.dart | 84 +++--- snapshots/output/basic-project/lib/other.dart | 51 ++-- .../basic-project/lib/relationships.dart | 15 +- snapshots/output/diagnostics/lib/main.dart | 16 +- 9 files changed, 135 insertions(+), 340 deletions(-) diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart index 00eebfc6..1e2003d4 100644 --- a/lib/src/scip_visitor.dart +++ b/lib/src/scip_visitor.dart @@ -164,6 +164,7 @@ class ScipVisitor extends GeneralizingAstVisitor { _registerAsReference( element, + node, offset: offset, length: element.nameLength, ); @@ -175,6 +176,7 @@ class ScipVisitor extends GeneralizingAstVisitor { _registerAsReference( element, + node, offset: node.offset, length: element.nameLength, ); @@ -184,7 +186,7 @@ class ScipVisitor extends GeneralizingAstVisitor { final element = node.declaredElement; if (element == null) return; - _registerAsDefinition(element); + _registerAsDefinition(element, node); } /// Registers the provided [element] as a reference to an existing definition diff --git a/pubspec.lock b/pubspec.lock index 9150a5a3..695d72bb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: e440ac42679dfc04bbbefb58ed225c994bc7e07fccc8a68ec7d3631a127e5da9 + sha256: "0f7b1783ddb1e4600580b8c00d0ddae5b06ae7f0382bd4fcce5db4df97b618e1" url: "https://pub.dev" source: hosted - version: "64.0.0" + version: "66.0.0" analyzer: dependency: "direct main" description: name: analyzer - sha256: "2c2e3721ee9fb36de92faa060f3480c81b23e904352b087e5c64224b1a044427" + sha256: "5e8bdcda061d91da6b034d64d8e4026f355bcb8c3e7a0ac2da1523205a91a737" url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.4.0" args: dependency: "direct main" description: name: args - sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 url: "https://pub.dev" source: hosted version: "2.4.2" @@ -33,22 +33,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.11.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - build: - dependency: transitive - description: - name: build - sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" - url: "https://pub.dev" - source: hosted - version: "2.3.1" build_config: dependency: transitive description: @@ -57,54 +41,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" - chalk: - dependency: "direct dev" - description: - name: build_daemon - sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169" - url: "https://pub.dev" - source: hosted - version: "3.1.1" - build_resolvers: - dependency: transitive - description: - name: build_resolvers - sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 - url: "https://pub.dev" - source: hosted - version: "2.2.0" - build_runner: - dependency: transitive - description: - name: build_runner - sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727 - url: "https://pub.dev" - source: hosted - version: "2.3.3" - build_runner_core: - dependency: transitive - description: - name: build_runner_core - sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292" - url: "https://pub.dev" - source: hosted - version: "7.2.7" - built_collection: - dependency: transitive - description: - name: built_collection - sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" - url: "https://pub.dev" - source: hosted - version: "5.1.1" - built_value: - dependency: transitive - description: - name: built_value - sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" - url: "https://pub.dev" - source: hosted - version: "8.6.1" chalk: dependency: "direct dev" description: @@ -117,18 +53,10 @@ packages: dependency: transitive description: name: checked_yaml - sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311" - url: "https://pub.dev" - source: hosted - version: "2.0.2" - code_builder: - dependency: transitive - description: - name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "2.0.3" collection: dependency: transitive description: @@ -149,26 +77,10 @@ packages: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 - url: "https://pub.dev" - source: hosted - version: "3.0.2" - dart_dev: - dependency: "direct dev" - description: - name: dart_dev - sha256: "05b00aabe00a284ccf007188475cce7963bf54fa266bb04856687d50d8b82ac1" - url: "https://pub.dev" - source: hosted - version: "4.1.0" - dart_style: - dependency: transitive - description: - name: dart_style - sha256: "5be16bf1707658e4c03078d4a9b90208ded217fb02c163e207d334082412f2fb" + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab url: "https://pub.dev" source: hosted - version: "2.2.5" + version: "3.0.3" dependency_validator: dependency: "direct dev" description: @@ -181,7 +93,7 @@ packages: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" url: "https://pub.dev" source: hosted version: "7.0.0" @@ -189,50 +101,18 @@ packages: dependency: transitive description: name: fixnum - sha256: "04be3e934c52e082558cc9ee21f42f5c1cd7a1262f4c63cd0357c08d5bba81ec" - url: "https://pub.dev" - source: hosted - version: "1.0.1" - frontend_server_client: - dependency: transitive - description: - name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "1.1.0" glob: - dependency: transitive + dependency: "direct dev" description: name: glob - sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - graphs: - dependency: transitive - description: - name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 - url: "https://pub.dev" - source: hosted - version: "2.3.1" - http_multi_server: - dependency: transitive - description: - name: http_multi_server - sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" url: "https://pub.dev" source: hosted - version: "3.2.1" - http_parser: - dependency: transitive - description: - name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" - url: "https://pub.dev" - source: hosted - version: "4.0.2" + version: "2.1.2" io: dependency: transitive description: @@ -241,19 +121,11 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" json_annotation: dependency: transitive description: name: json_annotation - sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 url: "https://pub.dev" source: hosted version: "4.8.1" @@ -261,34 +133,18 @@ packages: dependency: transitive description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.1.1" - matcher: - dependency: transitive - description: - name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" - url: "https://pub.dev" - source: hosted - version: "0.12.16" + version: "1.2.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" - url: "https://pub.dev" - source: hosted - version: "1.9.1" - mime: - dependency: transitive - description: - name: mime - sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.11.0" package_config: dependency: "direct main" description: @@ -301,23 +157,15 @@ packages: dependency: "direct main" description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" - pool: - dependency: transitive - description: - name: pool - sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" - url: "https://pub.dev" - source: hosted - version: "1.5.1" + version: "1.9.0" protobuf: dependency: "direct main" description: name: protobuf - sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08" + sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d" url: "https://pub.dev" source: hosted version: "3.1.0" @@ -337,22 +185,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.3" - shelf: - dependency: transitive - description: - name: shelf - sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 - url: "https://pub.dev" - source: hosted - version: "1.4.1" - shelf_web_socket: - dependency: transitive - description: - name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" - url: "https://pub.dev" - source: hosted - version: "1.0.4" source_span: dependency: transitive description: @@ -361,30 +193,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - stream_transform: - dependency: transitive - description: - name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" - url: "https://pub.dev" - source: hosted - version: "2.1.0" string_scanner: dependency: transitive description: @@ -401,22 +209,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" - url: "https://pub.dev" - source: hosted - version: "0.6.0" - timing: - dependency: transitive - description: - name: timing - sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" - url: "https://pub.dev" - source: hosted - version: "1.0.1" typed_data: dependency: transitive description: @@ -429,18 +221,10 @@ packages: dependency: transitive description: name: watcher - sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" - url: "https://pub.dev" - source: hosted - version: "1.0.2" - web_socket_channel: - dependency: transitive - description: - name: web_socket_channel - sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "1.1.0" workiva_analysis_options: dependency: "direct dev" description: @@ -453,7 +237,7 @@ packages: dependency: transitive description: name: yaml - sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" url: "https://pub.dev" source: hosted version: "3.1.2" diff --git a/pubspec.yaml b/pubspec.yaml index ef1c7adc..82cce2b5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,7 +19,6 @@ dependencies: dev_dependencies: chalk: ^1.2.1 - dart_dev: ^4.1.0 dependency_validator: ^3.2.3 glob: ^2.1.1 workiva_analysis_options: ^1.4.1 diff --git a/snapshots/input/diagnostics/pubspec.lock b/snapshots/input/diagnostics/pubspec.lock index 97c4e65c..694427d0 100644 --- a/snapshots/input/diagnostics/pubspec.lock +++ b/snapshots/input/diagnostics/pubspec.lock @@ -10,4 +10,4 @@ packages: source: hosted version: "2.0.1" sdks: - dart: ">=2.18.0 <3.0.0" + dart: ">=2.18.0 <4.0.0" diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 311eb114..cdfbda25 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -1,12 +1,12 @@ import 'package:dart_test/other.dart'; // definition scip-dart pub dart_test 1.0.0 lib/`main.dart`/ - + /// This is a fib function /// /// Takes a number /// Returns a number int fib(int n) { -//^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`int.dart`/int# +//^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`int.dart`/int# // ^^^ definition scip-dart pub dart_test 1.0.0 lib/`main.dart`/fib(). // documentation // > ```dart @@ -16,7 +16,7 @@ // > This is a fib function // > Takes a number // > Returns a number -// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`int.dart`/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`int.dart`/int# // ^ definition local 0 // documentation // > ```dart @@ -30,25 +30,25 @@ // ^^^ reference scip-dart pub dart_test 1.0.0 lib/`main.dart`/fib(). // ^ reference local 0 } - + void print_fib(int a) { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`main.dart`/print_fib(). // documentation // > ```dart // > void print_fib(int a) // > ``` -// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`int.dart`/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`int.dart`/int# // ^ definition local 1 // documentation // > ```dart // > int a // > ``` print(fib(a)); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). // ^^^ reference scip-dart pub dart_test 1.0.0 lib/`main.dart`/fib(). // ^ reference local 1 } - + final y = 'Hello'; // ^ definition scip-dart pub dart_test 1.0.0 lib/`main.dart`/y. // documentation @@ -56,7 +56,7 @@ // > String y // > ``` String capture() { -//^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# +//^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`main.dart`/capture(). // documentation // > ```dart @@ -65,7 +65,7 @@ return y; // ^ reference scip-dart pub dart_test 1.0.0 lib/`main.dart`/y. } - + final capture_lambda = () => y; // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`main.dart`/capture_lambda. // documentation @@ -73,7 +73,7 @@ // > String Function() capture_lambda // > ``` // ^ reference scip-dart pub dart_test 1.0.0 lib/`main.dart`/y. - + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/`main.dart`/main(). // documentation @@ -88,7 +88,7 @@ // > ``` // ^ reference local 2 // ^ reference local 2 - + for (var i in [1, 2, 3]) { // ^ definition local 3 // documentation @@ -96,10 +96,10 @@ // > int i // > ``` print(i); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). // ^ reference local 3 } - + var a = 0; // ^ definition local 4 // documentation @@ -112,7 +112,7 @@ // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`main.dart`/print_fib(). // ^ reference local 4 } - + void forever() { // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`main.dart`/forever(). // documentation @@ -122,14 +122,14 @@ return forever(); // ^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`main.dart`/forever(). } - + class SomeLocalClass {} // ^^^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`main.dart`/SomeLocalClass# // documentation // > ```dart // > class SomeLocalClass // > ``` - + /// Reference parameter: [value] // ^^^^^ reference local 5 /// Reference class: [SomeLocalClass] @@ -148,7 +148,7 @@ // > Reference class: [SomeLocalClass] // > Reference external class: [Foo] // > Missing Reference: [IDontExist] -// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`int.dart`/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`int.dart`/int# // ^^^^^ definition local 5 // documentation // > ```dart diff --git a/snapshots/output/basic-project/lib/more.dart b/snapshots/output/basic-project/lib/more.dart index c7e65b68..016d705a 100755 --- a/snapshots/output/basic-project/lib/more.dart +++ b/snapshots/output/basic-project/lib/more.dart @@ -5,7 +5,7 @@ // > ```dart // > as math // > ``` - + enum AnimalType { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`more.dart`/AnimalType# // documentation @@ -31,14 +31,14 @@ // > AnimalType bird // > ``` } - + typedef SoundMaker = void Function(); // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`more.dart`/SoundMaker# // documentation // > ```dart // > typedef SoundMaker = void Function() // > ``` - + mixin SleepMixin { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`more.dart`/SleepMixin# // documentation @@ -52,10 +52,10 @@ // > void sleep() // > ``` print('zzz...'); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). } } - + class Animal with SleepMixin { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal# // documentation @@ -65,7 +65,7 @@ // relationship scip-dart pub dart_test 1.0.0 lib/`more.dart`/SleepMixin# implementation // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/SleepMixin# String name; -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#name. // documentation // > ```dart @@ -85,7 +85,7 @@ // > ```dart // > void Function() soundMaker // > ``` - + Animal(this.name, {required this.type}) { // ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#``(). // documentation @@ -112,29 +112,29 @@ // ^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/AnimalType#cat. soundMaker = () => print('Meow!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). break; case AnimalType.dog: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/AnimalType#dog. soundMaker = () => print('Woof!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). break; case AnimalType.bird: // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/AnimalType# // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/AnimalType#bird. soundMaker = () => print('Chirp!'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). break; default: soundMaker = () => print('Unknown animal type'); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#soundMaker. -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). } } - + void makeSound() { // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#makeSound(). // documentation @@ -144,32 +144,32 @@ soundMaker?.call(); // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#soundMaker. } - + @override -// ^^^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`annotations.dart`/override. +// ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`annotations.dart`/override. String toString() { -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# // ^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#toString(). // documentation // > ```dart // > String toString() // > ``` -// relationship scip-dart pub dart:core 2.19.0 dart:core/`object.dart`/Object#toString(). implementation reference +// relationship scip-dart pub dart:core 3.1.0 dart:core/`object.dart`/Object#toString(). implementation reference return '$name the $type'; // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#name. // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#type. } } - + int calculateSum(List numbers) { -//^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`int.dart`/int# +//^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`int.dart`/int# // ^^^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`more.dart`/calculateSum(). // documentation // > ```dart // > int calculateSum(List numbers) // > ``` -// ^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`list.dart`/List# -// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`int.dart`/int# +// ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`list.dart`/List# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`int.dart`/int# // ^^^^^^^ definition local 1 // documentation // > ```dart @@ -177,7 +177,7 @@ // > ``` return numbers.reduce((value, element) => value + element); // ^^^^^^^ reference local 1 -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`iterable.dart`/Iterable#reduce(). +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`iterable.dart`/Iterable#reduce(). // ^^^^^ definition local 2 // documentation // > ```dart @@ -191,7 +191,7 @@ // ^^^^^ reference local 2 // ^^^^^^^ reference local 3 } - + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/`more.dart`/main(). // documentation @@ -199,15 +199,15 @@ // > void main() // > ``` List numbers = [1, 2, 3, 4, 5]; -// ^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`list.dart`/List# -// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`int.dart`/int# +// ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`list.dart`/List# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`int.dart`/int# // ^^^^^^^ definition local 4 // documentation // > ```dart // > List numbers // > ``` int sum = calculateSum(numbers); -// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`int.dart`/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`int.dart`/int# // ^^^ definition local 5 // documentation // > ```dart @@ -215,7 +215,7 @@ // > ``` // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/calculateSum(). // ^^^^^^^ reference local 4 - + Animal cat = Animal('Kitty', type: AnimalType.cat); // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal# // ^^^ definition local 6 @@ -238,39 +238,39 @@ // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#``().(type) // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/AnimalType# // ^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/AnimalType#dog. - + cat.makeSound(); // ^^^ reference local 6 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#makeSound(). cat.sleep(); // ^^^ reference local 6 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/SleepMixin#sleep(). - + dog.makeSound(); // ^^^ reference local 7 // ^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/Animal#makeSound(). dog.sleep(); // ^^^ reference local 7 // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/SleepMixin#sleep(). - + print(cat); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). // ^^^ reference local 6 print(dog); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). // ^^^ reference local 7 print('The sum of $numbers is $sum'); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). // ^^^^^^^ reference local 4 // ^^^ reference local 5 - + print(math.Rectangle(1,2,3,4)); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). // ^^^^ reference scip-dart pub dart_test 1.0.0 lib/`more.dart`/math. -// ^^^^^^^^^ reference scip-dart pub dart:math 2.19.0 dart:math/`rectangle.dart`/Rectangle# - +// ^^^^^^^^^ reference scip-dart pub dart:math 3.1.0 dart:math/`rectangle.dart`/Rectangle# + [1,2].reduce((a, b) => a + b); -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`iterable.dart`/Iterable#reduce(). +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`iterable.dart`/Iterable#reduce(). // ^ definition local 8 // documentation // > ```dart @@ -284,15 +284,15 @@ // ^ reference local 8 // ^ reference local 9 } - + void test(String Function(int) p) {} // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/`more.dart`/test(). // documentation // > ```dart // > void test(String Function(int) p) // > ``` -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# -// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`int.dart`/int# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`int.dart`/int# // ^ definition local 10 // documentation // > ```dart @@ -304,8 +304,8 @@ // > ```dart // > void deepTest(String Function(void Function(String)) p) // > ``` -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# // ^ definition local 11 // documentation // > ```dart diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart index e0aa00ff..50c122d6 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -5,7 +5,7 @@ // > ```dart // > as more // > ``` - + class Foo { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/`other.dart`/Foo# // documentation @@ -13,26 +13,35 @@ // > class Foo // > ``` int _far; -// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`int.dart`/int# // ^^^^ definition local 0 // documentation // > ```dart // > int _far // > ``` -// diagnostic Information: +// diagnostic Warning: // > The value of the field '_far' isn't used. bool value; -// ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/bool.dart/bool# -// ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value. -// documentation ```dart +// ^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`bool.dart`/bool# +// ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`other.dart`/Foo#value. +// documentation +// > ```dart +// > bool value +// > ``` String value2; -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# -// ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value2. -// documentation ```dart +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# +// ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`other.dart`/Foo#value2. +// documentation +// > ```dart +// > String value2 +// > ``` double value3; -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/double.dart/double# -// ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value3. -// documentation ```dart +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`double.dart`/double# +// ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`other.dart`/Foo#value3. +// documentation +// > ```dart +// > double value3 +// > ``` Foo(this._far); // ^^^ definition scip-dart pub dart_test 1.0.0 lib/`other.dart`/Foo#``(). // documentation @@ -59,7 +68,7 @@ // > int _far // > ``` } - + class Bar { // ^^^ definition scip-dart pub dart_test 1.0.0 lib/`other.dart`/Bar# // documentation @@ -67,7 +76,7 @@ // > class Bar // > ``` String _someValue; -// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# // ^^^^^^^^^^ definition local 2 // documentation // > ```dart @@ -86,7 +95,7 @@ // > ```dart // > String _someValue // > ``` - + void someMethod() { // ^^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`other.dart`/Bar#someMethod(). // documentation @@ -96,11 +105,11 @@ _someValue = 'asdf'; // ^^^^^^^^^^ reference local 2 print(_someValue); -// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). // ^^^^^^^^^^ reference local 2 } } - + void main() { // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/`other.dart`/main(). // documentation @@ -108,8 +117,8 @@ // > void main() // > ``` more.loadLibrary().then((_) => { -// ^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/more. -// ^^^^ reference scip-dart pub dart:async 3.1.0 dart:async/future.dart/Future#then(). +// ^^^^ reference scip-dart pub dart_test 1.0.0 lib/`other.dart`/more. +// ^^^^ reference scip-dart pub dart:async 3.1.0 dart:async/`future.dart`/Future#then(). // ^ definition local 4 // documentation // > ```dart @@ -119,11 +128,11 @@ // ^^^ reference scip-dart pub dart_test 1.0.0 lib/`other.dart`/Bar# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`other.dart`/Bar#someMethod(). }); - + Foo()..value = false; // ^^^ reference scip-dart pub dart_test 1.0.0 lib/`other.dart`/Foo# // ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`other.dart`/Foo#value. - + final someStr = 'someStr'; // ^^^^^^^ definition local 5 // documentation diff --git a/snapshots/output/basic-project/lib/relationships.dart b/snapshots/output/basic-project/lib/relationships.dart index 174afc43..6fe70019 100755 --- a/snapshots/output/basic-project/lib/relationships.dart +++ b/snapshots/output/basic-project/lib/relationships.dart @@ -6,7 +6,7 @@ // > abstract class Mammal // > ``` String get hierarchy; -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`relationships.dart`/Mammal#hierarchy. // documentation // > ```dart @@ -23,7 +23,7 @@ // relationship scip-dart pub dart_test 1.0.0 lib/`relationships.dart`/Mammal# implementation // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`relationships.dart`/Mammal# String sound() => 'NOISE!'; -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`relationships.dart`/Animal#sound(). // documentation // > ```dart @@ -43,7 +43,7 @@ // > ```dart // > void execute() // > ``` -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). } class Dog extends Animal with SwimAction { @@ -58,9 +58,9 @@ // ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`relationships.dart`/Animal# // ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/`relationships.dart`/SwimAction# @override -// ^^^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`annotations.dart`/override. +// ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`annotations.dart`/override. String sound() => 'woof'; -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# // ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`relationships.dart`/Dog#sound(). // documentation // > ```dart @@ -69,9 +69,9 @@ // relationship scip-dart pub dart_test 1.0.0 lib/`relationships.dart`/Animal#sound(). implementation reference @override -// ^^^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`annotations.dart`/override. +// ^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`annotations.dart`/override. String get hierarchy => 'dog.animal.mammal'; -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# // ^^^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/`relationships.dart`/Dog#hierarchy. // documentation // > ```dart @@ -79,3 +79,4 @@ // > ``` // relationship scip-dart pub dart_test 1.0.0 lib/`relationships.dart`/Mammal#hierarchy. implementation reference } + diff --git a/snapshots/output/diagnostics/lib/main.dart b/snapshots/output/diagnostics/lib/main.dart index d49fda0a..85ac8cb1 100755 --- a/snapshots/output/diagnostics/lib/main.dart +++ b/snapshots/output/diagnostics/lib/main.dart @@ -20,7 +20,7 @@ // > The declaration '_unusedMethod' isn't referenced. String _unusedTopLevelVariable = 'asdf'; -//^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# +//^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# // ^^^^^^^^^^^^^^^^^^^^^^^ definition local 2 // documentation // > ```dart @@ -30,7 +30,7 @@ // > The declaration '_unusedTopLevelVariable' isn't referenced. @Deprecated('This method is deprecated') -// ^^^^^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`annotations.dart`/Deprecated# +// ^^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`annotations.dart`/Deprecated# void deprecatedMethod() {} // ^^^^^^^^^^^^^^^^ definition scip-dart pub dart_test_diagnostics 1.0.0 lib/`main.dart`/deprecatedMethod(). // documentation @@ -45,7 +45,7 @@ // > void deprecatedParam({dynamic foobar}) // > ``` @Deprecated('this param is deprecated') dynamic foobar -// ^^^^^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`annotations.dart`/Deprecated# +// ^^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`annotations.dart`/Deprecated# // ^^^^^^ definition scip-dart pub dart_test_diagnostics 1.0.0 lib/`main.dart`/deprecatedParam().(foobar) // documentation // > ```dart @@ -65,23 +65,23 @@ // > ```dart // > String unusedVariable // > ``` -// diagnostic Information: +// diagnostic Warning: // > The value of the local variable 'unusedVariable' isn't used. String variableWithUnecssaryDeclaration = 'asdf'; -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`string.dart`/String# +// ^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`string.dart`/String# // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition local 4 // documentation // > ```dart // > String variableWithUnecssaryDeclaration // > ``` -// diagnostic Information: +// diagnostic Warning: // > The value of the local variable 'variableWithUnecssaryDeclaration' isn't used. // dead_code example if (true) { } else { print('This condition is never met!'); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`print.dart`/print(). +// ^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`print.dart`/print(). } deprecatedMethod(); @@ -96,7 +96,7 @@ } @deprecated -// ^^^^^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/`annotations.dart`/deprecated. +// ^^^^^^^^^^ reference scip-dart pub dart:core 3.1.0 dart:core/`annotations.dart`/deprecated. void someDeprecatedFunc() {} // ^^^^^^^^^^^^^^^^^^ definition scip-dart pub dart_test_diagnostics 1.0.0 lib/`main.dart`/someDeprecatedFunc(). // documentation