[Statistic] Do not show statistics, switch focus according to a request.

Author: kaniandr

src/aliasTree.ts

@@ -16,6 +16,7 @@ export function registerCommands(engine: ProjectEngine, subscriptions: Disposabl
       let project = engine.project(uri);
       let state = project.providerState(AliasTreeProvider.scheme);
       state.active = true;
+      project.focus = state;
       let request = new msg.AliasTree;
       let query = JSON.parse(uri.query);
       request.FuncID = query.FuncID;

src/extension.ts

@@ -83,14 +83,10 @@ export function activate(context: vscode.ExtensionContext) {
          })
         .then(
           async project => {
-            let state = project.providerState(ProjectProvider.scheme);
-            state.onDidDisposeContent(() => {engine.stop(project)},
-              null, context.subscriptions);
             await engine.runTool(project);
             project.providerState(FileListProvider.scheme).active = true;
             project.send(new msg.FileList);
-            state.active = true;
-            project.send(new msg.Statistic);
+            vscode.commands.executeCommand('tsar.function.list', project.uri);
           },
           reason => { onReject(reason, uri) })
     });
@@ -180,6 +176,7 @@ export function activate(context: vscode.ExtensionContext) {
       // Dispose current webview if required request is new.
       state.active = false;
       state.active = true;
+      project.focus = state;
       project.send(request);
     });
   context.subscriptions.push(start, stop, openProject, showCalleeFunc);

src/fileList.ts

@@ -170,6 +170,7 @@ export class FileListProvider implements ProjectContentProvider {
             });
         });
   }
+  clear(project: Project): any {}
   dispose() {
     this._disposables.forEach(d => d.dispose());
     this._disposables.length = 0;

src/loopTree.ts

@@ -25,6 +25,7 @@ export function registerCommands(engine: ProjectEngine, subscriptions: Disposabl
       let project = engine.project(uri);
       let state = project.providerState(LoopTreeProvider.scheme);
       state.active = true;
+      project.focus = state;
       let request = new msg.FunctionList;
       if (!state.actual(request))
         project.send(request);
@@ -34,6 +35,7 @@ export function registerCommands(engine: ProjectEngine, subscriptions: Disposabl
       let project = engine.project(uri);
       let state = project.providerState(LoopTreeProvider.scheme);
       state.active = true;
+      project.focus = state;
       let looptree = new msg.LoopTree;
       let query = JSON.parse(uri.query);
       looptree.FunctionID = query.ID;
@@ -120,6 +122,9 @@ export class LoopTreeProvider extends ProjectWebviewProvider {
     return new LoopTreeProviderState(this);
   }
 
+  clear(project: Project) {
+  }
+
   protected _title(): string { return log.FunctionList.title; }
 
   protected _needToHandle(response: any): boolean {

src/project.ts

@@ -521,6 +521,11 @@ export interface ProjectContentProvider {
    */
   update(project: Project): any;
 
+  /**
+   * Clear visible content for a specified project.
+   */
+  clear(project: Project): any;
+
   /**
    *  Dispose provider.
    */
@@ -605,6 +610,8 @@ export class Project {
 
   public arguments: msg.Arguments;
 
+  public focus: ProjectContentProviderState;
+
   /**
    * Create a project with a specified uri.
    *
@@ -637,6 +644,7 @@ export class Project {
   dispose() {
     if (this._isDisposed)
       return;
+    this._providers.forEach(state => {state.provider.clear(this)});
     this._isDisposed = true;
     this._providers.clear();
     this._output.hide();

src/transformProvider.ts

@@ -51,6 +51,7 @@ export function registerCommands(
                 });
               }).then((value) => {vscode.commands.executeCommand('tsar.stop', project.uri)});
               state.active = true;
+              project.focus = state;
               await engine.runTool(project, info.run)
               project.send('');
             },
@@ -96,6 +97,7 @@ export class TransformationProvider implements ProjectContentProvider {
   readonly onDidAriseInternalError = this._onDidAriseInternalError.event;
 
   state(): TransformationProviderState { return new TransformationProviderState(this) };
+  clear() {}
 
   update(project: Project) {
     let state = project.providerState(

src/webviewProvider.ts

@@ -81,14 +81,18 @@ export class ProjectWebviewProviderState<ProviderT extends ProjectWebviewProvide
       this._panel = vscode.window.createWebviewPanel(
         this._provider.scheme(),
         log.Extension.displayName,
-        columnToShowIn,
+        {
+          viewColumn: columnToShowIn,
+          preserveFocus: true,
+        },
         {
           enableCommandUris: true,
           enableScripts: true,
          enableFindWidget: true,
         }
       );
       this._panel.onDidDispose(() => {
+        this.active = false;
         this._hasPanel = false;
         this._onDidDisposeContent.fire();
       }, null, this.disposables);
@@ -106,12 +110,14 @@ export class ProjectWebviewProviderState<ProviderT extends ProjectWebviewProvide
 }
 
 export abstract class ProjectWebviewProvider implements ProjectContentProvider{
-  protected readonly _disposables: vscode.Disposable[];
+  protected readonly _disposables: vscode.Disposable[] = [];
 
   protected _onDidAriseInternalError = new vscode.EventEmitter<Error>();
   readonly onDidAriseInternalError = this._onDidAriseInternalError.event;
 
   dispose() { this._disposables.forEach(d => d.dispose()); }
+  clear(project: Project) {}
+
 
   /**
    * Return a new description of a project content provider state.
@@ -133,7 +139,8 @@ export abstract class ProjectWebviewProvider implements ProjectContentProvider{
       let panel = state.panel;
       panel.title = `${log.Extension.displayName} | ${project.prjname}`;
       panel.webview.html = data;
-      panel.reveal();
+      if (project.focus == state)
+        panel.reveal();
     }, data => {
       this._onDidAriseInternalError.fire(new Error(data));
       vscode.window.showErrorMessage(log.Extension.displayName +