Replace try/finally with PerformanceTag.makeCurrentWhile().

pkg/analysis_server/lib/src/operation/operation_analysis.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library operation.analysis;
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/computer/computer_highlights.dart';
 import 'package:analysis_server/src/computer/computer_navigation.dart';
 import 'package:analysis_server/src/computer/computer_occurrences.dart';
 import 'package:analysis_server/src/computer/computer_outline.dart';
 import 'package:analysis_server/src/computer/computer_overrides.dart';
 import 'package:analysis_server/src/operation/operation.dart';
 import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/html.dart';
 import 'package:analyzer/src/generated/source.dart';
-import 'package:analyzer/src/generated/utilities_general.dart';
 
 
 /**
  * Schedules sending notifications for the given [file] using the resolved
  * [resolvedDartUnit].
  */
 void scheduleNotificationOperations(AnalysisServer server, String file,
     LineInfo lineInfo, AnalysisContext context, CompilationUnit parsedDartUnit,
     CompilationUnit resolvedDartUnit, List<AnalysisError> errors) {
   // Only send notifications if the current context is the preferred
@@ skipping 183 matching lines @@
     AnalysisResult result = context.performAnalysisTask();
     List<ChangeNotice> notices = result.changeNotices;
     if (notices == null) {
       _setCacheSize(IDLE_CACHE_SIZE);
       server.sendContextAnalysisDoneNotifications(
           context,
           AnalysisDoneReason.COMPLETE);
       return;
     }
     // process results
-    PerformanceTag prevTag = ServerPerformanceStatistics.notices.makeCurrent();
-    try {
+    ServerPerformanceStatistics.notices.makeCurrentWhile(() {
       _sendNotices(server, notices);
-      ServerPerformanceStatistics.index.makeCurrent();
       _updateIndex(server, notices);

[Brian Wilkerson, 2015/02/24 22:31:07]

The execution of _updateIndex is no longer counted as part of
ServerPerformanceStatistics.index. Was that intentional?

[scheglov, 2015/02/24 22:33:05]

Yes.
All what it does is just scheduling indexing, with 0.08% of total time.
Now scheduling sending notifications and indexing are in one "notices" bucket.

-    } finally {
-      prevTag.makeCurrent();
-    }
+    });
     // continue analysis
     server.addOperation(new PerformAnalysisOperation(context, true));
   }
 
   /**
    * Send the information in the given list of notices back to the client.
    */
   void _sendNotices(AnalysisServer server, List<ChangeNotice> notices) {
     for (int i = 0; i < notices.length; i++) {
       ChangeNotice notice = notices[i];
@@ skipping 69 matching lines @@
 
   _DartIndexOperation(this.context, String file, this.unit) : super(file);
 
   @override
   ServerOperationPriority get priority {
     return ServerOperationPriority.ANALYSIS_INDEX;
   }
 
   @override
   void perform(AnalysisServer server) {
-    PerformanceTag prevTag =
-        ServerPerformanceStatistics.indexOperation.makeCurrent();
-    try {
+    ServerPerformanceStatistics.indexOperation.makeCurrentWhile(() {
       Index index = server.index;
       index.indexUnit(context, unit);
-    } finally {
-      prevTag.makeCurrent();
-    }
+    });
   }
 }
 
 
 class _DartNavigationOperation extends _DartNotificationOperation {
   _DartNavigationOperation(String file, CompilationUnit unit)
       : super(file, unit);
 
   @override
   void perform(AnalysisServer server) {
@@ skipping 90 matching lines @@
 abstract class _SingleFileOperation extends SourceSensitiveOperation {
   final String file;
 
   _SingleFileOperation(this.file);
 
   @override
   bool shouldBeDiscardedOnSourceChange(Source source) {
     return source.fullName == file;
   }
 }