| Index: pkg/analyzer/lib/src/generated/sdk_io.dart
|
| diff --git a/pkg/analyzer/lib/src/generated/sdk_io.dart b/pkg/analyzer/lib/src/generated/sdk_io.dart
|
| index 2544ebbd6bd868ab8e04ec3fdd824bda32241a60..ff105f09261d54cd9cc1c4ee25b6d2a360627086 100644
|
| --- a/pkg/analyzer/lib/src/generated/sdk_io.dart
|
| +++ b/pkg/analyzer/lib/src/generated/sdk_io.dart
|
| @@ -23,32 +23,31 @@ import 'sdk.dart';
|
| import 'source_io.dart';
|
|
|
| /**
|
| - * Instances of the class `DirectoryBasedDartSdk` represent a Dart SDK installed in a
|
| - * specified directory. Typical Dart SDK layout is something like...
|
| + * A Dart SDK installed in a specified directory. Typical Dart SDK layout is
|
| + * something like...
|
| *
|
| - * <pre>
|
| - * dart-sdk/
|
| - * bin/
|
| - * dart[.exe] <-- VM
|
| - * lib/
|
| - * core/
|
| - * core.dart
|
| - * ... other core library files ...
|
| - * ... other libraries ...
|
| - * util/
|
| - * ... Dart utilities ...
|
| - * Chromium/ <-- Dartium typically exists in a sibling directory
|
| - * </pre>
|
| + * dart-sdk/
|
| + * bin/
|
| + * dart[.exe] <-- VM
|
| + * lib/
|
| + * core/
|
| + * core.dart
|
| + * ... other core library files ...
|
| + * ... other libraries ...
|
| + * util/
|
| + * ... Dart utilities ...
|
| + * Chromium/ <-- Dartium typically exists in a sibling directory
|
| */
|
| class DirectoryBasedDartSdk implements DartSdk {
|
| /**
|
| - * The default SDK, or `null` if the default SDK either has not yet been created or cannot
|
| - * be created for some reason.
|
| + * The default SDK, or `null` if the default SDK either has not yet been
|
| + * created or cannot be created for some reason.
|
| */
|
| static DirectoryBasedDartSdk _DEFAULT_SDK;
|
|
|
| /**
|
| - * The name of the directory within the SDK directory that contains executables.
|
| + * The name of the directory within the SDK directory that contains
|
| + * executables.
|
| */
|
| static String _BIN_DIRECTORY_NAME = "bin";
|
|
|
| @@ -94,30 +93,32 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| static String _DARTIUM_EXECUTABLE_NAME_WIN = "Chrome.exe";
|
|
|
| /**
|
| - * The name of the [System] property whose value is the path to the default Dart SDK
|
| - * directory.
|
| + * The name of the [System] property whose value is the path to the default
|
| + * Dart SDK directory.
|
| */
|
| static String _DEFAULT_DIRECTORY_PROPERTY_NAME = "com.google.dart.sdk";
|
|
|
| /**
|
| - * The name of the directory within the SDK directory that contains documentation for the
|
| - * libraries.
|
| + * The name of the directory within the SDK directory that contains
|
| + * documentation for the libraries.
|
| */
|
| static String _DOCS_DIRECTORY_NAME = "docs";
|
|
|
| /**
|
| - * The suffix added to the name of a library to derive the name of the file containing the
|
| - * documentation for that library.
|
| + * The suffix added to the name of a library to derive the name of the file
|
| + * containing the documentation for that library.
|
| */
|
| static String _DOC_FILE_SUFFIX = "_api.json";
|
|
|
| /**
|
| - * The name of the directory within the SDK directory that contains the libraries file.
|
| + * The name of the directory within the SDK directory that contains the
|
| + * libraries file.
|
| */
|
| static String _INTERNAL_DIR = "_internal";
|
|
|
| /**
|
| - * The name of the directory within the SDK directory that contains the libraries.
|
| + * The name of the directory within the SDK directory that contains the
|
| + * libraries.
|
| */
|
| static String _LIB_DIRECTORY_NAME = "lib";
|
|
|
| @@ -137,25 +138,26 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| static String _PUB_EXECUTABLE_NAME = "pub";
|
|
|
| /**
|
| - * The name of the file within the SDK directory that contains the version number of the SDK.
|
| + * The name of the file within the SDK directory that contains the version
|
| + * number of the SDK.
|
| */
|
| static String _VERSION_FILE_NAME = "version";
|
|
|
| /**
|
| - * The name of the file containing the VM executable on the Windows operating system.
|
| + * The name of the file containing the VM executable on the Windows operating
|
| + * system.
|
| */
|
| static String _VM_EXECUTABLE_NAME_WIN = "dart.exe";
|
|
|
| /**
|
| - * The name of the file containing the VM executable on non-Windows operating systems.
|
| + * The name of the file containing the VM executable on non-Windows operating
|
| + * systems.
|
| */
|
| static String _VM_EXECUTABLE_NAME = "dart";
|
|
|
| /**
|
| - * Return the default Dart SDK, or `null` if the directory containing the default SDK cannot
|
| - * be determined (or does not exist).
|
| - *
|
| - * @return the default Dart SDK
|
| + * Return the default Dart SDK, or `null` if the directory containing the
|
| + * default SDK cannot be determined (or does not exist).
|
| */
|
| static DirectoryBasedDartSdk get defaultSdk {
|
| if (_DEFAULT_SDK == null) {
|
| @@ -169,11 +171,9 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| }
|
|
|
| /**
|
| - * Return the default directory for the Dart SDK, or `null` if the directory cannot be
|
| - * determined (or does not exist). The default directory is provided by a [System] property
|
| - * named `com.google.dart.sdk`.
|
| - *
|
| - * @return the default directory for the Dart SDK
|
| + * Return the default directory for the Dart SDK, or `null` if the directory
|
| + * cannot be determined (or does not exist). The default directory is provided
|
| + * by a system property named `com.google.dart.sdk`.
|
| */
|
| static JavaFile get defaultSdkDirectory {
|
| String sdkProperty =
|
| @@ -189,7 +189,7 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| }
|
|
|
| /**
|
| - * The [AnalysisContext] which is used for all of the sources in this [DartSdk].
|
| + * The [AnalysisContext] which is used for all of the sources in this sdk.
|
| */
|
| InternalAnalysisContext _analysisContext;
|
|
|
| @@ -199,7 +199,8 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| JavaFile _sdkDirectory;
|
|
|
| /**
|
| - * The revision number of this SDK, or `"0"` if the revision number cannot be discovered.
|
| + * The revision number of this SDK, or `"0"` if the revision number cannot be
|
| + * discovered.
|
| */
|
| String _sdkVersion;
|
|
|
| @@ -234,10 +235,9 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| LibraryMap _libraryMap;
|
|
|
| /**
|
| - * Initialize a newly created SDK to represent the Dart SDK installed in the given directory.
|
| - *
|
| - * @param sdkDirectory the directory containing the SDK
|
| - * @param useDart2jsPaths `true` if the dart2js path should be used when it is available
|
| + * Initialize a newly created SDK to represent the Dart SDK installed in the
|
| + * [sdkDirectory]. The flag [useDart2jsPaths] is `true` if the dart2js path
|
| + * should be used when it is available
|
| */
|
| DirectoryBasedDartSdk(JavaFile sdkDirectory, [bool useDart2jsPaths = false]) {
|
| this._sdkDirectory = sdkDirectory.getAbsoluteFile();
|
| @@ -261,9 +261,8 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| }
|
|
|
| /**
|
| - * Return the file containing the dart2js executable, or `null` if it does not exist.
|
| - *
|
| - * @return the file containing the dart2js executable
|
| + * Return the file containing the dart2js executable, or `null` if it does not
|
| + * exist.
|
| */
|
| JavaFile get dart2JsExecutable {
|
| if (_dart2jsExecutable == null) {
|
| @@ -277,9 +276,8 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| }
|
|
|
| /**
|
| - * Return the file containing the dart formatter executable, or `null` if it does not exist.
|
| - *
|
| - * @return the file containing the dart formatter executable
|
| + * Return the file containing the dart formatter executable, or `null` if it
|
| + * does not exist.
|
| */
|
| JavaFile get dartFmtExecutable {
|
| if (_dartFmtExecutable == null) {
|
| @@ -294,8 +292,6 @@ class DirectoryBasedDartSdk implements DartSdk {
|
|
|
| /**
|
| * Return the name of the file containing the Dartium executable.
|
| - *
|
| - * @return the name of the file containing the Dartium executable
|
| */
|
| String get dartiumBinaryName {
|
| if (OSUtilities.isWindows()) {
|
| @@ -308,9 +304,8 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| }
|
|
|
| /**
|
| - * Return the file containing the Dartium executable, or `null` if it does not exist.
|
| - *
|
| - * @return the file containing the Dartium executable
|
| + * Return the file containing the Dartium executable, or `null` if it does not
|
| + * exist.
|
| */
|
| JavaFile get dartiumExecutable {
|
| if (_dartiumExecutable == null) {
|
| @@ -321,55 +316,41 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| }
|
|
|
| /**
|
| - * Return the directory where dartium can be found (the directory that will be the working
|
| - * directory is Dartium is invoked without changing the default).
|
| - *
|
| - * @return the directory where dartium can be found
|
| + * Return the directory where dartium can be found (the directory that will be
|
| + * the working directory is Dartium is invoked without changing the default).
|
| */
|
| JavaFile get dartiumWorkingDirectory =>
|
| getDartiumWorkingDirectory(_sdkDirectory.getParentFile());
|
|
|
| /**
|
| * Return the directory containing the SDK.
|
| - *
|
| - * @return the directory containing the SDK
|
| */
|
| JavaFile get directory => _sdkDirectory;
|
|
|
| /**
|
| * Return the directory containing documentation for the SDK.
|
| - *
|
| - * @return the SDK's documentation directory
|
| */
|
| JavaFile get docDirectory =>
|
| new JavaFile.relative(_sdkDirectory, _DOCS_DIRECTORY_NAME);
|
|
|
| /**
|
| * Return `true` if this SDK includes documentation.
|
| - *
|
| - * @return `true` if this installation of the SDK has documentation
|
| */
|
| bool get hasDocumentation => docDirectory.exists();
|
|
|
| /**
|
| * Return `true` if the Dartium binary is available.
|
| - *
|
| - * @return `true` if the Dartium binary is available
|
| */
|
| bool get isDartiumInstalled => dartiumExecutable != null;
|
|
|
| /**
|
| * Return the directory within the SDK directory that contains the libraries.
|
| - *
|
| - * @return the directory that contains the libraries
|
| */
|
| JavaFile get libraryDirectory =>
|
| new JavaFile.relative(_sdkDirectory, _LIB_DIRECTORY_NAME);
|
|
|
| /**
|
| * Return the file containing the Pub executable, or `null` if it does not exist.
|
| - *
|
| - * @return the file containing the Pub executable
|
| */
|
| JavaFile get pubExecutable {
|
| if (_pubExecutable == null) {
|
| @@ -384,10 +365,8 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| List<SdkLibrary> get sdkLibraries => _libraryMap.sdkLibraries;
|
|
|
| /**
|
| - * Return the revision number of this SDK, or `"0"` if the revision number cannot be
|
| - * discovered.
|
| - *
|
| - * @return the revision number of this SDK
|
| + * Return the revision number of this SDK, or `"0"` if the revision number
|
| + * cannot be discovered.
|
| */
|
| @override
|
| String get sdkVersion {
|
| @@ -407,18 +386,11 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| return _sdkVersion;
|
| }
|
|
|
| - /**
|
| - * Return an array containing the library URI's for the libraries defined in this SDK.
|
| - *
|
| - * @return the library URI's for the libraries defined in this SDK
|
| - */
|
| @override
|
| List<String> get uris => _libraryMap.uris;
|
|
|
| /**
|
| * Return the name of the file containing the VM executable.
|
| - *
|
| - * @return the name of the file containing the VM executable
|
| */
|
| String get vmBinaryName {
|
| if (OSUtilities.isWindows()) {
|
| @@ -429,9 +401,8 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| }
|
|
|
| /**
|
| - * Return the file containing the VM executable, or `null` if it does not exist.
|
| - *
|
| - * @return the file containing the VM executable
|
| + * Return the file containing the VM executable, or `null` if it does not
|
| + * exist.
|
| */
|
| JavaFile get vmExecutable {
|
| if (_vmExecutable == null) {
|
| @@ -482,22 +453,16 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| }
|
|
|
| /**
|
| - * Return the directory where dartium can be found (the directory that will be the working
|
| - * directory is Dartium is invoked without changing the default).
|
| - *
|
| - * @param installDir the installation directory
|
| - * @return the directory where dartium can be found
|
| + * Return the directory where dartium can be found (the directory that will be
|
| + * the working directory if Dartium is invoked without changing the default),
|
| + * assuming that the Editor was installed in the [installDir].
|
| */
|
| JavaFile getDartiumWorkingDirectory(JavaFile installDir) =>
|
| new JavaFile.relative(installDir, _DARTIUM_DIRECTORY_NAME);
|
|
|
| /**
|
| - * Return the auxiliary documentation file for the given library, or `null` if no such file
|
| - * exists.
|
| - *
|
| - * @param libraryName the name of the library associated with the documentation file to be
|
| - * returned
|
| - * @return the auxiliary documentation file for the library
|
| + * Return the auxiliary documentation file for the library with the given
|
| + * [libraryName], or `null` if no such file exists.
|
| */
|
| JavaFile getDocFileFor(String libraryName) {
|
| JavaFile dir = docDirectory;
|
| @@ -517,10 +482,9 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| SdkLibrary getSdkLibrary(String dartUri) => _libraryMap.getLibrary(dartUri);
|
|
|
| /**
|
| - * Read all of the configuration files to initialize the library maps.
|
| - *
|
| - * @param useDart2jsPaths `true` if the dart2js path should be used when it is available
|
| - * @return the initialized library map
|
| + * Read all of the configuration files to initialize the library maps. The
|
| + * flag [useDart2jsPaths] is `true` if the dart2js path should be used when it
|
| + * is available. Return the initialized library map.
|
| */
|
| LibraryMap initialLibraryMap(bool useDart2jsPaths) {
|
| JavaFile librariesFile = new JavaFile.relative(
|
| @@ -567,68 +531,58 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| }
|
|
|
| /**
|
| - * Verify that the given executable file exists and is executable.
|
| - *
|
| - * @param file the binary file
|
| - * @return the file if it exists and is executable, else `null`
|
| + * Return the given [file] if it exists and is executable, or `null` if it
|
| + * does not exist or is not executable.
|
| */
|
| JavaFile _verifyExecutable(JavaFile file) =>
|
| file.isExecutable() ? file : null;
|
| }
|
|
|
| /**
|
| - * Instances of the class `SdkLibrariesReader` read and parse the libraries file
|
| - * (dart-sdk/lib/_internal/libraries.dart) for information about the libraries in an SDK. The
|
| - * library information is represented as a Dart file containing a single top-level variable whose
|
| - * value is a const map. The keys of the map are the names of libraries defined in the SDK and the
|
| - * values in the map are info objects defining the library. For example, a subset of a typical SDK
|
| - * might have a libraries file that looks like the following:
|
| + * An object used to read and parse the libraries file
|
| + * (dart-sdk/lib/_internal/libraries.dart) for information about the libraries
|
| + * in an SDK. The library information is represented as a Dart file containing a
|
| + * single top-level variable whose value is a const map. The keys of the map are
|
| + * the names of libraries defined in the SDK and the values in the map are info
|
| + * objects defining the library. For example, a subset of a typical SDK might
|
| + * have a libraries file that looks like the following:
|
| *
|
| - * <pre>
|
| - * final Map<String, LibraryInfo> LIBRARIES = const <LibraryInfo> {
|
| - * // Used by VM applications
|
| - * "builtin" : const LibraryInfo(
|
| - * "builtin/builtin_runtime.dart",
|
| - * category: "Server",
|
| - * platforms: VM_PLATFORM),
|
| + * final Map<String, LibraryInfo> LIBRARIES = const <LibraryInfo> {
|
| + * // Used by VM applications
|
| + * "builtin" : const LibraryInfo(
|
| + * "builtin/builtin_runtime.dart",
|
| + * category: "Server",
|
| + * platforms: VM_PLATFORM),
|
| *
|
| - * "compiler" : const LibraryInfo(
|
| - * "compiler/compiler.dart",
|
| - * category: "Tools",
|
| - * platforms: 0),
|
| - * };
|
| - * </pre>
|
| + * "compiler" : const LibraryInfo(
|
| + * "compiler/compiler.dart",
|
| + * category: "Tools",
|
| + * platforms: 0),
|
| + * };
|
| */
|
| class SdkLibrariesReader {
|
| /**
|
| - * A flag indicating whether the dart2js path should be used when it is available.
|
| + * A flag indicating whether the dart2js path should be used when it is
|
| + * available.
|
| */
|
| final bool _useDart2jsPaths;
|
|
|
| /**
|
| - * Initialize a newly created library reader to use the dart2js path if the given value is
|
| - * `true`.
|
| - *
|
| - * @param useDart2jsPaths `true` if the dart2js path should be used when it is available
|
| + * Initialize a newly created library reader to use the dart2js path if
|
| + * [_useDart2jsPaths] is `true`.
|
| */
|
| SdkLibrariesReader(this._useDart2jsPaths);
|
|
|
| /**
|
| - * Return the library map read from the given source.
|
| - *
|
| - * @param file the [File] of the library file
|
| - * @param libraryFileContents the contents from the library file
|
| - * @return the library map read from the given source
|
| + * Return the library map read from the given [file], given that the content
|
| + * of the file is already known to be [libraryFileContents].
|
| */
|
| LibraryMap readFromFile(JavaFile file, String libraryFileContents) =>
|
| readFromSource(new FileBasedSource.con1(file), libraryFileContents);
|
|
|
| /**
|
| - * Return the library map read from the given source.
|
| - *
|
| - * @param source the source of the library file
|
| - * @param libraryFileContents the contents from the library file
|
| - * @return the library map read from the given source
|
| + * Return the library map read from the given [source], given that the content
|
| + * of the file is already known to be [libraryFileContents].
|
| */
|
| LibraryMap readFromSource(Source source, String libraryFileContents) {
|
| BooleanErrorListener errorListener = new BooleanErrorListener();
|
|
|