7226309842
Having two separate packages doesn't really have any benefit, and has the downside of forcing us to carefully avoid circular dependencies between the two. It makes more sense to just combine them. This is largely a mechanical change consisting of the following renames: 1. pkg/analysis_services/lib/src/* -> pkg/analysis_server/lib/src/services/* 2. pkg/analysis_services/lib/* -> pkg/analysis_server/lib/src/services/* 3. pkg/analysis_services/test/* -> pkg/analysis_server/test/services/* There were 4 instances where 1 and 2 created a collision: .../services/correction/assist.dart, .../services/correction/fix.dart, .../services/refactoring/refactoring.dart, and .../services/search/search_engine_internal.dart. To fix the collision, the files coming from pkg/analysis_services/lib/src were renamed to "..._internal.dart". In addition, pkg/analysis_services/test/test_all.dart was modified to call pkg/analysis_services/test/services/test_all.dart. R=brianwilkerson@google.com, scheglov@google.com Review URL: https://codereview.chromium.org//484733003 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@39349 260f80e4-7a28-3924-810f-c04153c831b5