From 8a217d63903f1d1c171d2c84149ceeec4a780f01 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Tue, 28 Mar 2023 13:27:29 -0500 Subject: [PATCH 1/6] resolved dart sdk resolve issue --- lib/src/symbol.dart | 9 ++- pubspec.lock | 162 +++++++++++++++++++++++++++++--------------- 2 files changed, 114 insertions(+), 57 deletions(-) diff --git a/lib/src/symbol.dart b/lib/src/symbol.dart index 118bcaf3..dbdea022 100644 --- a/lib/src/symbol.dart +++ b/lib/src/symbol.dart @@ -156,9 +156,12 @@ class SymbolGenerator { if (sourcePath.startsWith(_projectRoot)) { filePath = sourcePath.substring('${_projectRoot}/'.length); } else if (element.library?.isInSdk == true) { - // TODO: there has to be a better way to get the path to a 'dart:*' file - filePath = sourcePath - .substring(sourcePath.indexOf('dart-sdk/lib/') + 'dart-sdk/'.length); + + if (element.enclosingElement?.source?.uri != null) { + filePath = element.enclosingElement!.source!.uri.toString(); + } else { + throw Exception('Unable to find path to dart sdk element: $sourcePath'); + } } else { final config = _packageConfig.packageOf(Uri.file(sourcePath)); if (config == null) { diff --git a/pubspec.lock b/pubspec.lock index 943a9340..78532f45 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,378 +5,432 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201" + url: "https://pub.dev" source: hosted version: "52.0.0" analyzer: dependency: "direct main" description: name: analyzer - url: "https://pub.dartlang.org" + sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4 + url: "https://pub.dev" source: hosted version: "5.4.0" args: dependency: "direct main" description: name: args - url: "https://pub.dartlang.org" + sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + url: "https://pub.dev" source: hosted version: "2.4.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted version: "2.10.0" 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: "169565c8ad06adb760c3645bf71f00bff161b00002cace266cad42c5d22a7725" + url: "https://pub.dev" source: hosted version: "8.4.3" 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: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + url: "https://pub.dev" source: hosted version: "1.17.1" 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: dc4ddf225a917fd7687a7c7c84201e071fd6038536eafcabf6572b25abeb92f9 + url: "https://pub.dev" source: hosted version: "3.9.2" dart_style: dependency: transitive description: name: dart_style - url: "https://pub.dartlang.org" + sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4" + url: "https://pub.dev" source: hosted version: "2.2.4" 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: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + url: "https://pub.dev" source: hosted version: "2.1.1" graphs: dependency: transitive description: name: graphs - url: "https://pub.dartlang.org" + sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2 + url: "https://pub.dev" source: hosted version: "2.2.0" 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: c94db23593b89766cda57aab9ac311e3616cf87c6fa4e9749df032f66f30dcb8 + url: "https://pub.dev" source: hosted version: "0.12.14" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "12307e7f0605ce3da64cf0db90e5fcab0869f3ca03f76be6bb2991ce0a55e82b" + url: "https://pub.dev" source: hosted version: "1.9.0" 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" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.dartlang.org" + sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602" + url: "https://pub.dev" source: hosted version: "1.11.1" 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: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + url: "https://pub.dev" source: hosted version: "2.1.3" pubspec_parse: dependency: "direct main" description: name: pubspec_parse - url: "https://pub.dartlang.org" + sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a" + url: "https://pub.dev" source: hosted version: "1.2.1" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c + url: "https://pub.dev" source: hosted version: "1.4.0" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8 + url: "https://pub.dev" source: hosted version: "1.0.3" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted version: "1.9.1" 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" 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: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted version: "1.3.1" 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: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b + url: "https://pub.dev" source: hosted version: "2.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: From f01a09d5929828a0568dd4d05aaf9464509b92f2 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Tue, 28 Mar 2023 13:29:46 -0500 Subject: [PATCH 2/6] regen snapshots --- snapshots/output/basic-project/lib/main.dart | 12 +++--- snapshots/output/basic-project/lib/more.dart | 40 +++++++++---------- snapshots/output/basic-project/lib/other.dart | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index cd79cf01..8950c22f 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -4,11 +4,11 @@ /// Takes a number /// Returns a number int fib(int n) { -//^^^ reference scip-dart pub dart:core 2.18.0 lib/core/int.dart/int# +//^^^ reference scip-dart pub dart:core 2.19.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 lib/core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart if (n <= 1) return 0; @@ -23,11 +23,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 lib/core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart print(fib(a)); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 lib/core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/print.dart/print(). // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 1 } @@ -36,7 +36,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 lib/core/string.dart/String# +//^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/string.dart/String# // ^^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/main.dart/capture(). // documentation ```dart return y; @@ -61,7 +61,7 @@ // ^ definition local 3 // documentation ```dart print(i); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 lib/core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.19.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 83f19673..0ff6c3d3 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 lib/core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.19.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 lib/core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart AnimalType type; @@ -61,23 +61,23 @@ // ^^^^^^^^^^ 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!'); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 lib/core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.19.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:core 2.18.0 lib/core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.19.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:core 2.18.0 lib/core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/print.dart/print(). break; default: soundMaker = () => print('Unknown animal type'); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 lib/core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/print.dart/print(). } } @@ -89,9 +89,9 @@ } @override -// ^^^^^^^^ reference scip-dart pub dart:core 2.18.0 lib/core/annotations.dart/override. +// ^^^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/annotations.dart/override. String toString() { -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 lib/core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 2.19.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'; @@ -101,16 +101,16 @@ } int calculateSum(List numbers) { -//^^^ reference scip-dart pub dart:core 2.18.0 lib/core/int.dart/int# +//^^^ reference scip-dart pub dart:core 2.19.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 lib/core/list.dart/List# -// ^^^ reference scip-dart pub dart:core 2.18.0 lib/core/int.dart/int# +// ^^^^ 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# // ^^^^^^^ definition local 0 // documentation ```dart return numbers.reduce((value, element) => value + element); // ^^^^^^^ reference local 0 -// ^^^^^^ reference scip-dart pub dart:core 2.18.0 lib/core/iterable.dart/Iterable#reduce(). +// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/iterable.dart/Iterable#reduce(). // ^^^^^ definition local 1 // documentation ```dart // ^^^^^^^ definition local 2 @@ -123,12 +123,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 lib/core/list.dart/List# -// ^^^ reference scip-dart pub dart:core 2.18.0 lib/core/int.dart/int# +// ^^^^ 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# // ^^^^^^^ definition local 3 // documentation ```dart int sum = calculateSum(numbers); -// ^^^ reference scip-dart pub dart:core 2.18.0 lib/core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/int.dart/int# // ^^^ definition local 4 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). @@ -164,19 +164,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 lib/core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/print.dart/print(). // ^^^ reference local 5 print(dog); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 lib/core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/print.dart/print(). // ^^^ reference local 6 print('The sum of $numbers is $sum'); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 lib/core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/print.dart/print(). // ^^^^^^^ reference local 3 // ^^^ reference local 4 print(math.Rectangle(1,2,3,4)); -// ^^^^^ reference scip-dart pub dart:core 2.18.0 lib/core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.19.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 lib/math/rectangle.dart/Rectangle# +// ^^^^^^^^^ reference scip-dart pub dart:math 2.19.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 b5373a0a..4f965ef6 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -3,7 +3,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 lib/core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart Foo(this._far); From ddaf4cbf07b0ebf0b5c0ccfb7224ded47ffa1d18 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Tue, 28 Mar 2023 13:31:48 -0500 Subject: [PATCH 3/6] reset pubspec.lock --- pubspec.lock | 162 +++++++++++++++++---------------------------------- 1 file changed, 54 insertions(+), 108 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 78532f45..943a9340 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,432 +5,378 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "52.0.0" analyzer: dependency: "direct main" description: name: analyzer - sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "5.4.0" args: dependency: "direct main" description: name: args - sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.4.0" async: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.10.0" build: dependency: transitive description: name: build - sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.3.1" build_config: dependency: transitive description: name: build_config - sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.1.1" build_daemon: dependency: transitive description: name: build_daemon - sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.1.1" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.2.0" build_runner: dependency: transitive description: name: build_runner - sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.3.3" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "7.2.7" built_collection: dependency: transitive description: name: built_collection - sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "5.1.1" built_value: dependency: transitive description: name: built_value - sha256: "169565c8ad06adb760c3645bf71f00bff161b00002cace266cad42c5d22a7725" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "8.4.3" checked_yaml: dependency: transitive description: name: checked_yaml - sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.0.2" code_builder: dependency: transitive description: name: code_builder - sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "4.4.0" collection: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.17.1" convert: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.1.1" crypto: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.0.2" dart_dev: dependency: "direct dev" description: name: dart_dev - sha256: dc4ddf225a917fd7687a7c7c84201e071fd6038536eafcabf6572b25abeb92f9 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.9.2" dart_style: dependency: transitive description: name: dart_style - sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.2.4" dependency_validator: dependency: "direct dev" description: name: dependency_validator - sha256: "08349175533ed0bd06eb9b6043cde66c45b2bfc7ebc222a7542cdb1324f1bf03" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.2.2" file: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "6.1.4" fixnum: dependency: transitive description: name: fixnum - sha256: "04be3e934c52e082558cc9ee21f42f5c1cd7a1262f4c63cd0357c08d5bba81ec" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.0.1" frontend_server_client: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.2.0" glob: dependency: "direct dev" description: name: glob - sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.1.1" graphs: dependency: transitive description: name: graphs - sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.2.0" http_multi_server: dependency: transitive description: name: http_multi_server - sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.2.1" http_parser: dependency: transitive description: name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "4.0.2" io: dependency: transitive description: name: io - sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.0.4" js: dependency: transitive description: name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "0.6.5" json_annotation: dependency: transitive description: name: json_annotation - sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "4.8.0" logging: dependency: transitive description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.1.1" matcher: dependency: transitive description: name: matcher - sha256: c94db23593b89766cda57aab9ac311e3616cf87c6fa4e9749df032f66f30dcb8 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "0.12.14" meta: dependency: transitive description: name: meta - sha256: "12307e7f0605ce3da64cf0db90e5fcab0869f3ca03f76be6bb2991ce0a55e82b" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.9.0" mime: dependency: transitive description: name: mime - sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.0.4" package_config: dependency: "direct main" description: name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.1.0" path: dependency: "direct main" description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.8.3" pedantic: dependency: transitive description: name: pedantic - sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.11.1" pool: dependency: transitive description: name: pool - sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.5.1" protobuf: dependency: "direct main" description: name: protobuf - sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.1.0" pub_semver: dependency: transitive description: name: pub_semver - sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.1.3" pubspec_parse: dependency: "direct main" description: name: pubspec_parse - sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.2.1" shelf: dependency: transitive description: name: shelf - sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.4.0" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.0.3" source_span: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.1.1" stream_transform: dependency: transitive description: name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.2.1" timing: dependency: transitive description: name: timing - sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.0.1" typed_data: dependency: transitive description: name: typed_data - sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.3.1" watcher: dependency: transitive description: name: watcher - sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "1.0.2" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "2.3.0" yaml: dependency: transitive description: name: yaml - sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" - url: "https://pub.dev" + url: "https://pub.dartlang.org" source: hosted version: "3.1.1" sdks: From 063d3ed677dc417c3defbef6f5f1e16319c6dcb9 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Tue, 28 Mar 2023 13:35:27 -0500 Subject: [PATCH 4/6] regen snaps --- snapshots/output/basic-project/lib/main.dart | 12 +++--- snapshots/output/basic-project/lib/more.dart | 40 +++++++++---------- snapshots/output/basic-project/lib/other.dart | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/snapshots/output/basic-project/lib/main.dart b/snapshots/output/basic-project/lib/main.dart index 8950c22f..f90a37ad 100755 --- a/snapshots/output/basic-project/lib/main.dart +++ b/snapshots/output/basic-project/lib/main.dart @@ -4,11 +4,11 @@ /// 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 2.18.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.19.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# // ^ definition local 0 // documentation ```dart if (n <= 1) return 0; @@ -23,11 +23,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.19.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# // ^ definition local 1 // documentation ```dart print(fib(a)); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). // ^^^ reference scip-dart pub dart_test 1.0.0 lib/main.dart/fib(). // ^ reference local 1 } @@ -36,7 +36,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.19.0 dart:core/string.dart/String# +//^^^^^^ 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/capture(). // documentation ```dart return y; @@ -61,7 +61,7 @@ // ^ definition local 3 // documentation ```dart print(i); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.18.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 0ff6c3d3..75eb3c26 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.19.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.18.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.19.0 dart:core/string.dart/String# +// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String# // ^^^^ definition scip-dart pub dart_test 1.0.0 lib/more.dart/Animal#name. // documentation ```dart AnimalType type; @@ -61,23 +61,23 @@ // ^^^^^^^^^^ 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!'); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.18.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:core 2.19.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.18.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:core 2.19.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). break; default: soundMaker = () => print('Unknown animal type'); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). } } @@ -89,9 +89,9 @@ } @override -// ^^^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/annotations.dart/override. +// ^^^^^^^^ reference scip-dart pub dart:core 2.18.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 2.18.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'; @@ -101,16 +101,16 @@ } int calculateSum(List numbers) { -//^^^ reference scip-dart pub dart:core 2.19.0 dart:core/int.dart/int# +//^^^ reference scip-dart pub dart:core 2.18.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.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 2.18.0 dart:core/list.dart/List# +// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# // ^^^^^^^ definition local 0 // documentation ```dart return numbers.reduce((value, element) => value + element); // ^^^^^^^ reference local 0 -// ^^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/iterable.dart/Iterable#reduce(). +// ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/iterable.dart/Iterable#reduce(). // ^^^^^ definition local 1 // documentation ```dart // ^^^^^^^ definition local 2 @@ -123,12 +123,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.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 2.18.0 dart:core/list.dart/List# +// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# // ^^^^^^^ definition local 3 // documentation ```dart int sum = calculateSum(numbers); -// ^^^ reference scip-dart pub dart:core 2.19.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# // ^^^ definition local 4 // documentation ```dart // ^^^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/more.dart/calculateSum(). @@ -164,19 +164,19 @@ // ^^^^^ 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 2.18.0 dart:core/print.dart/print(). // ^^^ reference local 5 print(dog); -// ^^^^^ reference scip-dart pub dart:core 2.19.0 dart:core/print.dart/print(). +// ^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/print.dart/print(). // ^^^ reference local 6 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 2.18.0 dart:core/print.dart/print(). // ^^^^^^^ reference local 3 // ^^^ reference local 4 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 2.18.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 2.18.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 4f965ef6..65f6a1c7 100755 --- a/snapshots/output/basic-project/lib/other.dart +++ b/snapshots/output/basic-project/lib/other.dart @@ -3,7 +3,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.19.0 dart:core/int.dart/int# +// ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int# // ^^^^ definition local 0 // documentation ```dart Foo(this._far); From 1ac076a72b8219ed2699e475a0eca9088b2e4702 Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Tue, 28 Mar 2023 13:46:09 -0500 Subject: [PATCH 5/6] fixed gen for path --- lib/src/symbol.dart | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/lib/src/symbol.dart b/lib/src/symbol.dart index dbdea022..30a437a8 100644 --- a/lib/src/symbol.dart +++ b/lib/src/symbol.dart @@ -86,20 +86,9 @@ class SymbolGenerator { } String _sdkPackageSymbolFor(Element element) { - final path = element.source!.fullName; - - final searchPrefix = 'dart-sdk/lib/'; - if (!path.contains(searchPrefix)) { - throw Exception('Dart sdk path was not incorrect format: ${path}'); - } - final partialPath = - path.substring(path.indexOf(searchPrefix) + searchPrefix.length); - final dependencyName = partialPath.substring(0, partialPath.indexOf('/')); - - final packageName = 'dart:$dependencyName'; + final packageName = _pathForSdkElement(element).split('/').first; final packageVersion = element.library!.languageVersion.package.toString(); - - return 'pub $packageName $packageVersion'; + return 'pub ${packageName} $packageVersion'; } String _currentPackageSymbolFor(Element element) { @@ -155,13 +144,8 @@ class SymbolGenerator { String filePath; if (sourcePath.startsWith(_projectRoot)) { filePath = sourcePath.substring('${_projectRoot}/'.length); - } else if (element.library?.isInSdk == true) { - - if (element.enclosingElement?.source?.uri != null) { - filePath = element.enclosingElement!.source!.uri.toString(); - } else { - throw Exception('Unable to find path to dart sdk element: $sourcePath'); - } + } else if (_isInSdk(element)) { + filePath = _pathForSdkElement(element); } else { final config = _packageConfig.packageOf(Uri.file(sourcePath)); if (config == null) { @@ -260,6 +244,14 @@ class SymbolGenerator { return element.library?.isInSdk == true; } + String _pathForSdkElement(Element element) { + if (element.enclosingElement?.source?.uri != null) { + return element.enclosingElement!.source!.uri.toString(); + } else { + throw Exception('Unable to find path to dart sdk element: ${element.source!.fullName}'); + } + } + bool _isInCurrentPackage(Element element) { return element.source!.fullName.startsWith(_projectRoot); } From 0ee2c8691d14434349c449140a2934fa77a60a1c Mon Sep 17 00:00:00 2001 From: Matthew Nitschke Date: Tue, 28 Mar 2023 13:50:11 -0500 Subject: [PATCH 6/6] fmt --- lib/src/symbol.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/src/symbol.dart b/lib/src/symbol.dart index 30a437a8..f2e74149 100644 --- a/lib/src/symbol.dart +++ b/lib/src/symbol.dart @@ -248,7 +248,8 @@ class SymbolGenerator { if (element.enclosingElement?.source?.uri != null) { return element.enclosingElement!.source!.uri.toString(); } else { - throw Exception('Unable to find path to dart sdk element: ${element.source!.fullName}'); + throw Exception( + 'Unable to find path to dart sdk element: ${element.source!.fullName}'); } }