Index: pkg/analyzer/tool/summary/idl.dart |
diff --git a/pkg/analyzer/tool/summary/idl.dart b/pkg/analyzer/tool/summary/idl.dart |
index b450499438e2203a3f949df71ecb6ebe99b0a735..500acaec12483819d424b5604089aa9d12007a83 100644 |
--- a/pkg/analyzer/tool/summary/idl.dart |
+++ b/pkg/analyzer/tool/summary/idl.dart |
@@ -104,6 +104,22 @@ class PrelinkedLibrary { |
} |
/** |
+ * Information about the resolution of an [UnlinkedReference]. |
+ */ |
+class PrelinkedReference { |
+ /** |
+ * Index into [UnlinkedLibrary.dependencies] indicating which imported library |
+ * declares the entity being referred to. |
+ */ |
+ int dependency; |
+ |
+ /** |
+ * The kind of the entity being referred to. |
+ */ |
+ PrelinkedReferenceKind kind; |
+} |
+ |
+/** |
* Enum used to indicate the kind of entity referred to by a |
* [PrelinkedReference]. |
*/ |
@@ -130,22 +146,6 @@ enum PrelinkedReferenceKind { |
} |
/** |
- * Information about the resolution of an [UnlinkedReference]. |
- */ |
-class PrelinkedReference { |
- /** |
- * Index into [UnlinkedLibrary.dependencies] indicating which imported library |
- * declares the entity being referred to. |
- */ |
- int dependency; |
- |
- /** |
- * The kind of the entity being referred to. |
- */ |
- PrelinkedReferenceKind kind; |
-} |
- |
-/** |
* Unlinked summary information about a class declaration. |
*/ |
class UnlinkedClass { |
@@ -212,12 +212,23 @@ class UnlinkedCombinator { |
/** |
* List of names which are shown. Empty if this is a `hide` combinator. |
*/ |
- List<String> shows; |
+ List<UnlinkedCombinatorName> shows; |
/** |
* List of names which are hidden. Empty if this is a `show` combinator. |
*/ |
- List<String> hides; |
+ List<UnlinkedCombinatorName> hides; |
+} |
+ |
+/** |
+ * Unlinked summary information about a single name in a `show` or `hide` |
+ * combinator. |
+ */ |
+class UnlinkedCombinatorName { |
+ /** |
+ * The name itself. |
+ */ |
+ String name; |
} |
/** |
@@ -254,31 +265,6 @@ class UnlinkedEnumValue { |
} |
/** |
- * Enum used to indicate the kind of an executable. |
- */ |
-enum UnlinkedExecutableKind { |
- /** |
- * Executable is a function or method. |
- */ |
- functionOrMethod, |
- |
- /** |
- * Executable is a getter. |
- */ |
- getter, |
- |
- /** |
- * Executable is a setter. |
- */ |
- setter, |
- |
- /** |
- * Executable is a constructor. |
- */ |
- constructor |
-} |
- |
-/** |
* Unlinked summary information about a function, method, getter, or setter |
* declaration. |
*/ |
@@ -350,6 +336,31 @@ class UnlinkedExecutable { |
} |
/** |
+ * Enum used to indicate the kind of an executable. |
+ */ |
+enum UnlinkedExecutableKind { |
+ /** |
+ * Executable is a function or method. |
+ */ |
+ functionOrMethod, |
+ |
+ /** |
+ * Executable is a getter. |
+ */ |
+ getter, |
+ |
+ /** |
+ * Executable is a setter. |
+ */ |
+ setter, |
+ |
+ /** |
+ * Executable is a constructor. |
+ */ |
+ constructor |
+} |
+ |
+/** |
* Unlinked summary information about an export declaration. |
*/ |
class UnlinkedExport { |
@@ -468,26 +479,6 @@ class UnlinkedLibrary { |
} |
/** |
- * Enum used to indicate the kind of a parameter. |
- */ |
-enum UnlinkedParamKind { |
- /** |
- * Parameter is required. |
- */ |
- required, |
- |
- /** |
- * Parameter is positional optional (enclosed in `[]`) |
- */ |
- positional, |
- |
- /** |
- * Parameter is named optional (enclosed in `{}`) |
- */ |
- named |
-} |
- |
-/** |
* Unlinked summary information about a function parameter. |
*/ |
class UnlinkedParam { |
@@ -527,6 +518,26 @@ class UnlinkedParam { |
bool isInitializingFormal; |
} |
+/** |
+ * Enum used to indicate the kind of a parameter. |
+ */ |
+enum UnlinkedParamKind { |
+ /** |
+ * Parameter is required. |
+ */ |
+ required, |
+ |
+ /** |
+ * Parameter is positional optional (enclosed in `[]`) |
+ */ |
+ positional, |
+ |
+ /** |
+ * Parameter is named optional (enclosed in `{}`) |
+ */ |
+ named |
+} |
+ |
class UnlinkedPrefix { |
/** |
* The name of the prefix, or the empty string in the case of the |