Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Side by Side Diff: pkg/analysis_server/lib/src/analysis_server.dart

Issue 341273007: Allow multiple dirs per package in the data returned by "pub list". (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 library analysis.server; 5 library analysis.server;
6 6
7 import 'dart:async'; 7 import 'dart:async';
8 import 'dart:collection'; 8 import 'dart:collection';
9 9
10 import 'package:analysis_server/src/analysis_logger.dart'; 10 import 'package:analysis_server/src/analysis_logger.dart';
(...skipping 30 matching lines...) Expand all
41 /** 41 /**
42 * The default options used to create new analysis contexts. 42 * The default options used to create new analysis contexts.
43 */ 43 */
44 AnalysisOptionsImpl defaultOptions = new AnalysisOptionsImpl(); 44 AnalysisOptionsImpl defaultOptions = new AnalysisOptionsImpl();
45 45
46 AnalysisServerContextDirectoryManager(this.analysisServer, ResourceProvider re sourceProvider) 46 AnalysisServerContextDirectoryManager(this.analysisServer, ResourceProvider re sourceProvider)
47 : super(resourceProvider); 47 : super(resourceProvider);
48 48
49 @override 49 @override
50 void addContext(Folder folder, File pubspecFile) { 50 void addContext(Folder folder, File pubspecFile) {
51 Map<String, Folder> packageMap = 51 Map<String, List<Folder>> packageMap =
52 analysisServer.packageMapProvider.computePackageMap(folder); 52 analysisServer.packageMapProvider.computePackageMap(folder);
53 ContextDirectory contextDirectory = new ContextDirectory( 53 ContextDirectory contextDirectory = new ContextDirectory(
54 analysisServer.defaultSdk, resourceProvider, folder, packageMap); 54 analysisServer.defaultSdk, resourceProvider, folder, packageMap);
55 analysisServer.folderMap[folder] = contextDirectory; 55 analysisServer.folderMap[folder] = contextDirectory;
56 AnalysisContext context = contextDirectory.context; 56 AnalysisContext context = contextDirectory.context;
57 context.analysisOptions = new AnalysisOptionsImpl.con1(defaultOptions); 57 context.analysisOptions = new AnalysisOptionsImpl.con1(defaultOptions);
58 analysisServer.schedulePerformAnalysisOperation(context); 58 analysisServer.schedulePerformAnalysisOperation(context);
59 } 59 }
60 60
61 @override 61 @override
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 * The root [Folder] of this [ContextDirectory]. 582 * The root [Folder] of this [ContextDirectory].
583 */ 583 */
584 final Folder _folder; 584 final Folder _folder;
585 585
586 /** 586 /**
587 * The [AnalysisContext] of this [_folder]. 587 * The [AnalysisContext] of this [_folder].
588 */ 588 */
589 AnalysisContext _context; 589 AnalysisContext _context;
590 590
591 ContextDirectory(DartSdk sdk, this._resourceProvider, this._folder, 591 ContextDirectory(DartSdk sdk, this._resourceProvider, this._folder,
592 Map<String, Folder> packageMap) { 592 Map<String, List<Folder>> packageMap) {
593 // create AnalysisContext 593 // create AnalysisContext
594 _context = AnalysisEngine.instance.createAnalysisContext(); 594 _context = AnalysisEngine.instance.createAnalysisContext();
595 // TODO(scheglov) replace FileUriResolver with an Resource based resolver 595 // TODO(scheglov) replace FileUriResolver with an Resource based resolver
596 List<UriResolver> resolvers = <UriResolver>[new DartUriResolver(sdk), 596 List<UriResolver> resolvers = <UriResolver>[new DartUriResolver(sdk),
597 new FileUriResolver(), 597 new FileUriResolver(),
598 ]; 598 ];
599 if (packageMap != null) { 599 if (packageMap != null) {
600 resolvers.add(new PackageMapUriResolver(_resourceProvider, packageMap)); 600 resolvers.add(new PackageMapUriResolver(_resourceProvider, packageMap));
601 } 601 }
602 _context.sourceFactory = new SourceFactory(resolvers); 602 _context.sourceFactory = new SourceFactory(resolvers);
(...skipping 10 matching lines...) Expand all
613 /** 613 /**
614 * An enumeration of the services provided by the server domain. 614 * An enumeration of the services provided by the server domain.
615 */ 615 */
616 class ServerService extends Enum2<ServerService> { 616 class ServerService extends Enum2<ServerService> {
617 static const ServerService STATUS = const ServerService('STATUS', 0); 617 static const ServerService STATUS = const ServerService('STATUS', 0);
618 618
619 static const List<ServerService> VALUES = const [STATUS]; 619 static const List<ServerService> VALUES = const [STATUS];
620 620
621 const ServerService(String name, int ordinal) : super(name, ordinal); 621 const ServerService(String name, int ordinal) : super(name, ordinal);
622 } 622 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698