added queryRunner.uri to queryModelService (#16835)

This commit is contained in:
Alex Ma
2021-08-19 13:41:15 -07:00
committed by GitHub
parent ac76409335
commit bbe77d6823

View File

@@ -249,7 +249,7 @@ export class QueryModelService implements IQueryModelService {
let queryRunner = this._instantiationService.createInstance(EditQueryRunner, uri); let queryRunner = this._instantiationService.createInstance(EditQueryRunner, uri);
let info = new QueryInfo(); let info = new QueryInfo();
queryRunner.onResultSet(e => { queryRunner.onResultSet(e => {
this._fireQueryEvent(uri, 'resultSet', e); this._fireQueryEvent(queryRunner.uri, 'resultSet', e);
}); });
queryRunner.onBatchStart(b => { queryRunner.onBatchStart(b => {
let link = undefined; let link = undefined;
@@ -273,18 +273,18 @@ export class QueryModelService implements IQueryModelService {
time: new Date().toLocaleTimeString(), time: new Date().toLocaleTimeString(),
link: link link: link
}; };
this._fireQueryEvent(uri, 'message', message); this._fireQueryEvent(queryRunner.uri, 'message', message);
}); });
queryRunner.onMessage(m => { queryRunner.onMessage(m => {
this._fireQueryEvent(uri, 'message', m); this._fireQueryEvent(queryRunner.uri, 'message', m);
}); });
queryRunner.onQueryEnd(totalMilliseconds => { queryRunner.onQueryEnd(totalMilliseconds => {
this._onRunQueryComplete.fire(uri); this._onRunQueryComplete.fire(queryRunner.uri);
// fire extensibility API event // fire extensibility API event
let event: IQueryEvent = { let event: IQueryEvent = {
type: 'queryStop', type: 'queryStop',
uri: uri, uri: queryRunner.uri,
queryInfo: queryInfo:
{ {
range: info.range!, range: info.range!,
@@ -294,15 +294,15 @@ export class QueryModelService implements IQueryModelService {
this._onQueryEvent.fire(event); this._onQueryEvent.fire(event);
// fire UI event // fire UI event
this._fireQueryEvent(uri, 'complete', totalMilliseconds); this._fireQueryEvent(queryRunner.uri, 'complete', totalMilliseconds);
}); });
queryRunner.onQueryStart(() => { queryRunner.onQueryStart(() => {
this._onRunQueryStart.fire(uri); this._onRunQueryStart.fire(queryRunner.uri);
// fire extensibility API event // fire extensibility API event
let event: IQueryEvent = { let event: IQueryEvent = {
type: 'queryStart', type: 'queryStart',
uri: uri, uri: queryRunner.uri,
queryInfo: queryInfo:
{ {
range: info.range!, range: info.range!,
@@ -311,14 +311,14 @@ export class QueryModelService implements IQueryModelService {
}; };
this._onQueryEvent.fire(event); this._onQueryEvent.fire(event);
this._fireQueryEvent(uri, 'start'); this._fireQueryEvent(queryRunner.uri, 'start');
}); });
queryRunner.onResultSetUpdate(() => { queryRunner.onResultSetUpdate(() => {
this._onRunQueryUpdate.fire(uri); this._onRunQueryUpdate.fire(queryRunner.uri);
let event: IQueryEvent = { let event: IQueryEvent = {
type: 'queryUpdate', type: 'queryUpdate',
uri: uri, uri: queryRunner.uri,
queryInfo: queryInfo:
{ {
range: info.range!, range: info.range!,
@@ -327,7 +327,7 @@ export class QueryModelService implements IQueryModelService {
}; };
this._onQueryEvent.fire(event); this._onQueryEvent.fire(event);
this._fireQueryEvent(uri, 'update'); this._fireQueryEvent(queryRunner.uri, 'update');
}); });
queryRunner.onQueryPlanAvailable(planInfo => { queryRunner.onQueryPlanAvailable(planInfo => {
@@ -348,7 +348,7 @@ export class QueryModelService implements IQueryModelService {
queryRunner.onVisualize(resultSetInfo => { queryRunner.onVisualize(resultSetInfo => {
let event: IQueryEvent = { let event: IQueryEvent = {
type: 'visualize', type: 'visualize',
uri: uri, uri: queryRunner.uri,
queryInfo: queryInfo:
{ {
range: info.range!, range: info.range!,
@@ -360,8 +360,8 @@ export class QueryModelService implements IQueryModelService {
}); });
info.queryRunner = queryRunner; info.queryRunner = queryRunner;
info.dataService = this._instantiationService.createInstance(DataService, uri); info.dataService = this._instantiationService.createInstance(DataService, queryRunner.uri);
this._queryInfoMap.set(uri, info); this._queryInfoMap.set(queryRunner.uri, info);
return info; return info;
} }