@theia/output 1.72.0-next.59 → 1.72.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/output-channel.d.ts.map +1 -1
- package/lib/browser/output-channel.js +0 -3
- package/lib/browser/output-channel.js.map +1 -1
- package/lib/browser/output-toolbar-contribution.d.ts +2 -2
- package/lib/browser/output-toolbar-contribution.d.ts.map +1 -1
- package/lib/browser/output-toolbar-contribution.js +8 -6
- package/lib/browser/output-toolbar-contribution.js.map +1 -1
- package/lib/browser/output-widget.d.ts +12 -3
- package/lib/browser/output-widget.d.ts.map +1 -1
- package/lib/browser/output-widget.js +26 -7
- package/lib/browser/output-widget.js.map +1 -1
- package/package.json +6 -6
- package/src/browser/output-channel.ts +0 -3
- package/src/browser/output-toolbar-contribution.tsx +7 -5
- package/src/browser/output-widget.ts +28 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output-channel.d.ts","sourceRoot":"","sources":["../../src/browser/output-channel.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAE7F,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,wDAAwD,CAAC;AACpF,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAa,SAAS,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEzE,qBACa,oBAAqB,YAAW,UAAU,EAAE,gBAAgB;IAGrE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,QAAQ,6BAAoC;IAC/D,SAAS,CAAC,QAAQ,CAAC,SAAS,8BAAqC;IACjE,SAAS,CAAC,gBAAgB,EAAE,aAAa,GAAG,SAAS,CAAC;IAEtD,SAAS,CAAC,QAAQ,CAAC,mBAAmB;cAAuB,MAAM;OAAM;IACzE,SAAS,CAAC,QAAQ,CAAC,qBAAqB;cAAuB,MAAM;OAAM;IAC3E,SAAS,CAAC,QAAQ,CAAC,sBAAsB;cAAuB,MAAM;wBAAkB,OAAO;OAAM;IACrG,SAAS,CAAC,QAAQ,CAAC,uBAAuB;cAAuB,MAAM;OAAM;IAC7E,SAAS,CAAC,QAAQ,CAAC,6BAA6B;cAAuB,MAAM;mBAAkB;IAE/F,QAAQ,CAAC,cAAc;cANsC,MAAM;OAMV;IACzD,QAAQ,CAAC,gBAAgB;cANsC,MAAM;OAMR;IAC7D,QAAQ,CAAC,iBAAiB;cANsC,MAAM;wBAAkB,OAAO;OAMhC;IAC/D,QAAQ,CAAC,kBAAkB;cANsC,MAAM;OAMN;IACjE,QAAQ,CAAC,wBAAwB;cANsC,MAAM;mBAMA;IAE7E,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAC1D,SAAS,CAAC,QAAQ,CAAC,0BAA0B,0BAAiC;IAE9E,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;
|
|
1
|
+
{"version":3,"file":"output-channel.d.ts","sourceRoot":"","sources":["../../src/browser/output-channel.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,9 +63,6 @@ let OutputChannelManager = class OutputChannelManager {
|
|
|
63
63
|
const channel = this.createChannel(resource);
|
|
64
64
|
this.channels.set(name, channel);
|
|
65
65
|
this.toDisposeOnChannelDeletion.set(name, this.registerListeners(channel));
|
|
66
|
-
if (!this.selectedChannel) {
|
|
67
|
-
this.selectedChannel = channel;
|
|
68
|
-
}
|
|
69
66
|
this.channelAddedEmitter.fire(channel);
|
|
70
67
|
return channel;
|
|
71
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output-channel.js","sourceRoot":"","sources":["../../src/browser/output-channel.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"output-channel.js","sourceRoot":"","sources":["../../src/browser/output-channel.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAkE;AAElE,sEAA+D;AAE/D,sCAA+E;AAE/E,mGAA6F;AAC7F,qDAAiD;AACjD,gEAA4D;AAC5D,qEAAiE;AAEjE,0EAAoD;AACpD,8DAA6B;AAC7B,6DAAyE;AAGlE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAA1B;QAQgB,aAAQ,GAAG,IAAI,GAAG,EAAyB,CAAC;QAC5C,cAAS,GAAG,IAAI,GAAG,EAA0B,CAAC;QAG9C,wBAAmB,GAAG,IAAI,cAAO,EAAoB,CAAC;QACtD,0BAAqB,GAAG,IAAI,cAAO,EAAoB,CAAC;QACxD,2BAAsB,GAAG,IAAI,cAAO,EAA6C,CAAC;QAClF,4BAAuB,GAAG,IAAI,cAAO,EAAoB,CAAC;QAC1D,kCAA6B,GAAG,IAAI,cAAO,EAAgC,CAAC;QAEtF,mBAAc,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;QAChD,qBAAgB,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;QACpD,sBAAiB,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC;QACtD,uBAAkB,GAAG,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC;QACxD,6BAAwB,GAAG,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC;QAE1D,cAAS,GAAG,IAAI,2BAAoB,EAAE,CAAC;QACvC,+BAA0B,GAAG,IAAI,GAAG,EAAsB,CAAC;IAmIlF,CAAC;IAjIG,UAAU,CAAC,IAAY;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,0GAA0G;QAC1G,qDAAqD;QACrD,gGAAgG;QAChG,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,MAAM,GAAG,GAAG,sBAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACnC,MAAM,cAAc,GAAG,IAAI,uBAAQ,EAAiC,CAAC;YACrE,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC;YACxD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACnC,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7F,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,OAAO,CAAC;IACnB,CAAC;IAES,iBAAiB,CAAC,OAAsB;QAC9C,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QACzB,OAAO,IAAI,2BAAoB,CAC3B,OAAO,EACP,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,EAAE;YACxD,IAAI,SAAS,EAAE,CAAC;gBACZ,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC;gBAC/B,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACJ,IAAI,OAAO,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC;oBACnC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC;gBACxD,CAAC;gBACD,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAChD,CAAC;QACL,CAAC,CAAC,EACF,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAClD,iBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,QAAQ,EAAE,CAAC;gBACX,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACnB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,IAAI,CAAC,2DAA2D,IAAI,IAAI,CAAC,CAAC;YACtF,CAAC;QACL,CAAC,CAAC,EACF,iBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YACnB,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CAAC,mDAAmD,IAAI,IAAI,CAAC,CAAC;gBAC1E,OAAO;YACX,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3B,SAAS,CAAC,OAAO,EAAE,CAAC;YACpB,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBAC7D,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC;YACxD,CAAC;QACL,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IAED,aAAa,CAAC,IAAY;QACtB,MAAM,SAAS,GAAG,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,SAAS,EAAE,CAAC;YACZ,SAAS,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC;IACL,CAAC;IAED,WAAW;QACP,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC3E,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACnE,CAAC;IAED,IAAc,iBAAiB;QAC3B,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACnB,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,EAAE,CAAC;gBACrC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,CAAC;YACD,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACvF,CAAC,CAAC;IACN,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAED,IAAI,eAAe,CAAC,OAAkC;QAClD,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;QAChC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;QAClF,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvD,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CAAC,GAAQ;QAClB,IAAI,CAAC,sBAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,aAAa,sBAAS,CAAC,MAAM,sBAAsB,GAAG,WAAW,CAAC,CAAC;QACvF,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,sBAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,+CAA+C,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACrF,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAES,cAAc,CAAC,EAAE,GAAG,EAAE,cAAc,EAAyE;QACnH,OAAO,IAAI,gCAAc,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IACnD,CAAC;IAES,aAAa,CAAC,QAAwB;QAC5C,OAAO,IAAI,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACzD,CAAC;CAEJ,CAAA;AA5JY,oDAAoB;AAGV;IADlB,IAAA,kBAAM,EAAC,kDAAsB,CAAC;sCACM,kDAAsB;8DAAC;AAGzC;IADlB,IAAA,kBAAM,EAAC,sCAAiB,CAAC;;yDACwB;+BANzC,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CA4JhC;AAED,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC7B,mEAAS,CAAA;IACT,uEAAW,CAAA;IACX,iEAAQ,CAAA;AACZ,CAAC,EAJW,qBAAqB,qCAArB,qBAAqB,QAIhC;AAED,MAAa,aAAa;IAuBtB,YAA+B,QAAwB,EAAqB,WAA8B;QAA3E,aAAQ,GAAR,QAAQ,CAAgB;QAAqB,gBAAW,GAAX,WAAW,CAAmB;QArBvF,yBAAoB,GAAG,IAAI,cAAO,EAAQ,CAAC;QAC3C,4BAAuB,GAAG,IAAI,cAAO,EAAmD,CAAC;QACzF,oBAAe,GAAG,IAAI,cAAO,EAAQ,CAAC;QACtC,oBAAe,GAAG,IAAI,iBAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;QAClE,cAAS,GAAG,IAAI,2BAAoB,CACnD,iBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,EACrD,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,uBAAuB,EAC5B,IAAI,CAAC,eAAe,CACvB,CAAC;QAEQ,aAAQ,GAAG,KAAK,CAAC;QACjB,YAAO,GAAG,IAAI,CAAC;QAEf,kBAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,cAAS,GAAc,EAAE,CAAC;QAE3B,uBAAkB,GAA2D,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC;QAChH,oBAAe,GAAgB,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC;QAC/D,eAAU,GAAgB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QAG1D,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC;QACnE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE;YAC7D,IAAI,KAAK,CAAC,cAAc,KAAK,0BAA0B,EAAE,CAAC;gBACtD,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC;gBACnE,IAAI,IAAI,CAAC,aAAa,KAAK,aAAa,EAAE,CAAC;oBACvC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;gBACvC,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,sBAAS,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;IAC7B,CAAC;IAED,IAAI;QACA,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACrE,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,EAAE,aAAa,KAAiC,EAAE,aAAa,EAAE,KAAK,EAAE;QACzE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;IACpF,CAAC;IAED;;OAEG;IACH,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,KAAK;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAChC,MAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;YACtF,SAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/D,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;YAC3B,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;YACpB,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACvB,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO;QACH,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACzB,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,OAAe,EAAE,WAAkC,qBAAqB,CAAC,IAAI;QAChF,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,UAAU,CAAC,OAAe,EAAE,WAAkC,qBAAqB,CAAC,IAAI;QACpF,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1F,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAA6E;QAChI,MAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;QACtF,MAAM,QAAQ,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;QAC1C,MAAM,iBAAiB,GAAG,SAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QAClE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAE3G,mEAAmE;QACnE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAA,8BAAS,EAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7E,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QAEvB,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,YAAY,GAAG,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;QACvF,MAAM,KAAK,GAAG,CAAC;gBACX,KAAK;gBACL,IAAI,EAAE,YAAY;gBAClB,gBAAgB,EAAE,IAAI;aACzB,CAAC,CAAC;QACH,yGAAyG;QACzG,4JAA4J;QAC5J,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAE5B,2EAA2E;QAC3E,IAAI,QAAQ,KAAK,qBAAqB,CAAC,IAAI,EAAE,CAAC;YAC1C,MAAM,eAAe,GAAG,QAAQ,KAAK,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,sBAAsB,CAAC;YACjH,IAAI,aAAa,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;YAC7C,wHAAwH;YACxH,0GAA0G;YAC1G,IAAI,CAAC,SAAS,CAAC,+BAA+B,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC5D,aAAa,EAAE,CAAC;YACpB,CAAC;YACD,MAAM,SAAS,GAAG,SAAS,CAAC,8BAA8B,CAAC,aAAa,CAAC,CAAC;YAC1E,MAAM,cAAc,GAAG,CAAC;oBACpB,KAAK,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,WAAW,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE;wBAClG,eAAe;qBAClB;iBACJ,CAAC,CAAC;YACH,KAAK,MAAM,YAAY,IAAI,SAAS,CAAC,gBAAgB,CAAC,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC;gBACxE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACzC,CAAC;QACL,CAAC;QAED,uDAAuD;QACvD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC7C,KAAK,EAAE,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,OAAO,EAAE,QAAQ,CAAC;gBAChE,OAAO,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,UAAU,EAAE;aACnD,CAAC,CAAC,CAAC;YACJ,KAAK,MAAM,YAAY,IAAI,SAAS,CAAC,gBAAgB,CAAC,EAAE,EAAE,eAAe,CAAC,EAAE,CAAC;gBACzE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACzC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;IACrC,CAAC;IAED;;;OAGG;IACO,mBAAmB,CAAC,YAAoB,EAAE,OAAoB,EAAE,cAA+B;QACrG,IAAI,SAAS,GAAG,cAAc,CAAC,UAAU,CAAC;QAC1C,IAAI,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC;QACxC,oDAAoD;QACpD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC3B,SAAS,EAAE,CAAC;gBACZ,WAAW,GAAG,CAAC,CAAC;YACpB,CAAC;iBAAM,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAClC,2BAA2B;YAC/B,CAAC;iBAAM,CAAC;gBACJ,WAAW,EAAE,CAAC;YAClB,CAAC;QACL,CAAC;QACD,IAAI,OAAO,GAAG,SAAS,CAAC;QACxB,IAAI,SAAS,GAAG,WAAW,CAAC;QAC5B,oCAAoC;QACpC,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC3B,OAAO,EAAE,CAAC;gBACV,SAAS,GAAG,CAAC,CAAC;YAClB,CAAC;iBAAM,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAClC,UAAU;YACd,CAAC;iBAAM,CAAC;gBACJ,SAAS,EAAE,CAAC;YAChB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IACxE,CAAC;IAES,uBAAuB,CAAC,SAAmC;QACjE,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;QACjC,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,wDAAwD;QACjI,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,SAAS,GAAG,SAAS,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAC5D,iEAAiE;YACjE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;YACnE,2CAA2C;YAC3C,MAAM,IAAI,GAAG,IAAI,CAAC;YAClB,MAAM,mBAAmB,GAAG,SAAS,CAAC,mBAAmB,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC;iBAChG,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,+EAA+E;YACxJ,IAAI,mBAAmB,CAAC,MAAM,EAAE,CAAC;gBAC7B,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,EAAE,CAAC,EAAE,CAAC;oBACtE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAClC,CAAC;gBACD,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE,CAAC;oBAC3C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAC1C,CAAC;YACL,CAAC;YACD,SAAS,CAAC,UAAU,CAAC;gBACjB;oBACI,KAAK,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,GAAG,CAAC,EAAE,SAAS,CAAC,+BAA+B,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;oBAC9G,IAAI;oBACJ,gBAAgB,EAAE,IAAI;iBACzB;aACJ,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,IAAc,aAAa;QACvB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,IAAc,aAAa,CAAC,aAAqB;QAC7C,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,+EAA+E;IACpG,CAAC;CAEJ;AA/ND,sCA+NC"}
|
|
@@ -2,11 +2,11 @@ import * as React from '@theia/core/shared/react';
|
|
|
2
2
|
import { Emitter } from '@theia/core/lib/common/event';
|
|
3
3
|
import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
4
4
|
import { SelectOption } from '@theia/core/lib/browser/widgets/select-component';
|
|
5
|
-
import {
|
|
5
|
+
import { WidgetManager } from '@theia/core/lib/browser/widget-manager';
|
|
6
6
|
import { OutputChannelManager } from './output-channel';
|
|
7
7
|
export declare class OutputToolbarContribution implements TabBarToolbarContribution {
|
|
8
8
|
protected readonly outputChannelManager: OutputChannelManager;
|
|
9
|
-
protected readonly
|
|
9
|
+
protected readonly widgetManager: WidgetManager;
|
|
10
10
|
protected readonly onOutputWidgetStateChangedEmitter: Emitter<void>;
|
|
11
11
|
protected readonly onOutputWidgetStateChanged: import("@theia/core/lib/common/event").Event<void>;
|
|
12
12
|
protected readonly onChannelsChangedEmitter: Emitter<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output-toolbar-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/output-toolbar-contribution.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACjH,OAAO,EAAmB,YAAY,EAAE,MAAM,kDAAkD,CAAC;
|
|
1
|
+
{"version":3,"file":"output-toolbar-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/output-toolbar-contribution.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACjH,OAAO,EAAmB,YAAY,EAAE,MAAM,kDAAkD,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAGvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGxD,qBACa,yBAA0B,YAAW,yBAAyB;IAGvE,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,SAAS,CAAC,QAAQ,CAAC,iCAAiC,gBAAuB;IAC3E,SAAS,CAAC,QAAQ,CAAC,0BAA0B,qDAAgD;IAE7F,SAAS,CAAC,QAAQ,CAAC,wBAAwB,gBAAuB;IAClE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,qDAAuC;IAG3E,SAAS,CAAC,IAAI,IAAI,IAAI;IActB,oBAAoB,CAAC,eAAe,EAAE,qBAAqB,GAAG,IAAI;IA6BlE,SAAS,CAAC,QAAQ,CAAC,IAAI,mBAAmB;IAC1C,SAAS,CAAC,QAAQ,CAAC,sBAAsB,uBAAuB;IAEhE,SAAS,CAAC,qBAAqB,IAAI,KAAK,CAAC,SAAS;IAsBlD,SAAS,CAAC,aAAa,GAAI,QAAQ,YAAY,UAK7C;CACL"}
|
|
@@ -21,9 +21,9 @@ const React = tslib_1.__importStar(require("@theia/core/shared/react"));
|
|
|
21
21
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
22
22
|
const event_1 = require("@theia/core/lib/common/event");
|
|
23
23
|
const select_component_1 = require("@theia/core/lib/browser/widgets/select-component");
|
|
24
|
+
const widget_manager_1 = require("@theia/core/lib/browser/widget-manager");
|
|
24
25
|
const output_widget_1 = require("./output-widget");
|
|
25
26
|
const output_commands_1 = require("./output-commands");
|
|
26
|
-
const output_contribution_1 = require("./output-contribution");
|
|
27
27
|
const output_channel_1 = require("./output-channel");
|
|
28
28
|
const nls_1 = require("@theia/core/lib/common/nls");
|
|
29
29
|
let OutputToolbarContribution = class OutputToolbarContribution {
|
|
@@ -42,8 +42,10 @@ let OutputToolbarContribution = class OutputToolbarContribution {
|
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
44
|
init() {
|
|
45
|
-
this.
|
|
46
|
-
|
|
45
|
+
this.widgetManager.onDidCreateWidget(({ factoryId, widget }) => {
|
|
46
|
+
if (factoryId === output_widget_1.OutputWidget.ID && widget instanceof output_widget_1.OutputWidget) {
|
|
47
|
+
widget.onStateChanged(() => this.onOutputWidgetStateChangedEmitter.fire());
|
|
48
|
+
}
|
|
47
49
|
});
|
|
48
50
|
const fireChannelsChanged = () => this.onChannelsChangedEmitter.fire();
|
|
49
51
|
this.outputChannelManager.onSelectedChannelChanged(fireChannelsChanged);
|
|
@@ -102,9 +104,9 @@ tslib_1.__decorate([
|
|
|
102
104
|
tslib_1.__metadata("design:type", output_channel_1.OutputChannelManager)
|
|
103
105
|
], OutputToolbarContribution.prototype, "outputChannelManager", void 0);
|
|
104
106
|
tslib_1.__decorate([
|
|
105
|
-
(0, inversify_1.inject)(
|
|
106
|
-
tslib_1.__metadata("design:type",
|
|
107
|
-
], OutputToolbarContribution.prototype, "
|
|
107
|
+
(0, inversify_1.inject)(widget_manager_1.WidgetManager),
|
|
108
|
+
tslib_1.__metadata("design:type", widget_manager_1.WidgetManager)
|
|
109
|
+
], OutputToolbarContribution.prototype, "widgetManager", void 0);
|
|
108
110
|
tslib_1.__decorate([
|
|
109
111
|
(0, inversify_1.postConstruct)(),
|
|
110
112
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output-toolbar-contribution.js","sourceRoot":"","sources":["../../src/browser/output-toolbar-contribution.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,qCAAqC;AACrC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,wEAAkD;AAClD,4DAAiF;AACjF,wDAAuD;AAEvD,uFAAiG;AACjG,mDAA+C;AAC/C,uDAAmD;AACnD
|
|
1
|
+
{"version":3,"file":"output-toolbar-contribution.js","sourceRoot":"","sources":["../../src/browser/output-toolbar-contribution.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,qCAAqC;AACrC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,wEAAkD;AAClD,4DAAiF;AACjF,wDAAuD;AAEvD,uFAAiG;AACjG,2EAAuE;AACvE,mDAA+C;AAC/C,uDAAmD;AACnD,qDAAwD;AACxD,oDAAiD;AAG1C,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAA/B;QAQgB,sCAAiC,GAAG,IAAI,eAAO,EAAQ,CAAC;QACxD,+BAA0B,GAAG,IAAI,CAAC,iCAAiC,CAAC,KAAK,CAAC;QAE1E,6BAAwB,GAAG,IAAI,eAAO,EAAQ,CAAC;QAC/C,sBAAiB,GAAG,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC;QA8CxD,SAAI,GAAG,eAAe,CAAC;QACvB,2BAAsB,GAAG,mBAAmB,CAAC;QAwBtD,kBAAa,GAAG,CAAC,MAAoB,EAAE,EAAE;YAC/C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;YACjC,IAAI,WAAW,KAAK,IAAI,CAAC,IAAI,IAAI,WAAW,EAAE,CAAC;gBAC3C,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;YAC7D,CAAC;QACL,CAAC,CAAC;IACN,CAAC;IA1Ea,IAAI;QACV,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE;YAC3D,IAAI,SAAS,KAAK,4BAAY,CAAC,EAAE,IAAI,MAAM,YAAY,4BAAY,EAAE,CAAC;gBAClE,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,CAAE,IAAI,CAAC,iCAAiC,CAAC,IAAI,EAAE,CAAC,CAAC;YAChF,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,CAAC;QACvE,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,CAAC;QACxE,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;QAC9D,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QAChE,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QACjE,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IACtE,CAAC;IAED,oBAAoB,CAAC,eAAsC;QACvD,eAAe,CAAC,YAAY,CAAC;YACzB,EAAE,EAAE,UAAU;YACd,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC1C,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,YAAY,4BAAY;YACnD,WAAW,EAAE,IAAI,CAAC,iBAAiB;SACtC,CAAC,CAAC;QACH,eAAe,CAAC,YAAY,CAAC;YACzB,EAAE,EAAE,gCAAc,CAAC,aAAa,CAAC,EAAE;YACnC,OAAO,EAAE,gCAAc,CAAC,aAAa,CAAC,EAAE;YACxC,OAAO,EAAE,SAAG,CAAC,iBAAiB,CAAC,cAAc,CAAC;YAC9C,QAAQ,EAAE,CAAC;SACd,CAAC,CAAC;QACH,eAAe,CAAC,YAAY,CAAC;YACzB,EAAE,EAAE,gCAAc,CAAC,YAAY,CAAC,EAAE;YAClC,OAAO,EAAE,gCAAc,CAAC,YAAY,CAAC,EAAE;YACvC,OAAO,EAAE,SAAG,CAAC,iBAAiB,CAAC,yBAAyB,CAAC;YACzD,WAAW,EAAE,IAAI,CAAC,0BAA0B;YAC5C,QAAQ,EAAE,CAAC;SACd,CAAC,CAAC;QACH,eAAe,CAAC,YAAY,CAAC;YACzB,EAAE,EAAE,gCAAc,CAAC,cAAc,CAAC,EAAE;YACpC,OAAO,EAAE,gCAAc,CAAC,cAAc,CAAC,EAAE;YACzC,OAAO,EAAE,SAAG,CAAC,iBAAiB,CAAC,wBAAwB,CAAC;YACxD,WAAW,EAAE,IAAI,CAAC,0BAA0B;YAC5C,QAAQ,EAAE,CAAC;SACd,CAAC,CAAC;IACP,CAAC;IAKS,qBAAqB;QAC3B,MAAM,qBAAqB,GAAmB,EAAE,CAAC;QACjD,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;YAClE,qBAAqB,CAAC,IAAI,CAAC;gBACvB,KAAK,EAAE,OAAO,CAAC,IAAI;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,qBAAqB,CAAC,IAAI,CAAC;gBACvB,KAAK,EAAE,IAAI,CAAC,IAAI;aACnB,CAAC,CAAC;QACP,CAAC;QACD,OAAO,6BAAK,EAAE,EAAE,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,IAAI,CAAC,sBAAsB;YACzE,oBAAC,kCAAe,IACZ,GAAG,EAAE,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,IAAI,EACpD,OAAO,EAAE,qBAAqB,EAC9B,YAAY,EAAE,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,IAAI,EAC7D,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAChD,CACA,CAAC;IACX,CAAC;CAQJ,CAAA;AAzFY,8DAAyB;AAGf;IADlB,IAAA,kBAAM,EAAC,qCAAoB,CAAC;sCACY,qCAAoB;uEAAC;AAG3C;IADlB,IAAA,kBAAM,EAAC,8BAAa,CAAC;sCACY,8BAAa;gEAAC;AAStC;IADT,IAAA,yBAAa,GAAE;;;;qDAaf;oCA3BQ,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAyFrC"}
|
|
@@ -20,9 +20,13 @@ export declare class OutputWidget extends BaseWidget implements StatefulWidget {
|
|
|
20
20
|
constructor();
|
|
21
21
|
protected init(): void;
|
|
22
22
|
/**
|
|
23
|
-
* Restore the selected channel from storage
|
|
24
|
-
*
|
|
25
|
-
*
|
|
23
|
+
* Restore the selected channel from storage. This handles the case where the
|
|
24
|
+
* Output widget was closed before the application shut down, so the widget was
|
|
25
|
+
* not in the layout and `storeState`/`restoreState` never ran.
|
|
26
|
+
*
|
|
27
|
+
* Only applies if the manager doesn't already have a selected channel — if it
|
|
28
|
+
* does, something (e.g. a `channel.show()` call) already set the selection
|
|
29
|
+
* before this widget was created, and we should not override it.
|
|
26
30
|
*/
|
|
27
31
|
protected restoreSelectedChannelFromStorage(): Promise<void>;
|
|
28
32
|
dispose(): void;
|
|
@@ -53,6 +57,11 @@ export declare class OutputWidget extends BaseWidget implements StatefulWidget {
|
|
|
53
57
|
unlock(): void;
|
|
54
58
|
get isLocked(): boolean;
|
|
55
59
|
protected revealLastLine(): void;
|
|
60
|
+
/**
|
|
61
|
+
* If no channel is currently selected, select the first visible channel
|
|
62
|
+
* as a default so the widget shows content rather than an empty view.
|
|
63
|
+
*/
|
|
64
|
+
protected ensureChannelSelected(): void;
|
|
56
65
|
private get selectedChannel();
|
|
57
66
|
private createEditorWidget;
|
|
58
67
|
private get editorWidget();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output-widget.d.ts","sourceRoot":"","sources":["../../src/browser/output-widget.ts"],"names":[],"mappings":"AAgBA,OAAO,oCAAoC,CAAC;AAI5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAc,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAe,cAAc,EAAW,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEvI,OAAO,EAAE,oBAAoB,EAAiB,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAa,MAAM,aAAa,CAAC;AAIxD,qBACa,YAAa,SAAQ,UAAW,YAAW,cAAc;IAElE,MAAM,CAAC,QAAQ,CAAC,EAAE,gBAAgB;IAClC,MAAM,CAAC,QAAQ,CAAC,KAAK,SAAmC;IACxD,MAAM,CAAC,QAAQ,CAAC,4BAA4B,oCAAoC;IAGhF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAElD,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK,CAAqB;IACzD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,SAAS,CAAC;IAC9C,SAAS,CAAC,QAAQ,CAAC,iCAAiC,uBAA8B;IAClF,SAAS,CAAC,QAAQ,CAAC,qBAAqB,8BAAqC;;IAiB7E,SAAS,CAAC,IAAI,IAAI,IAAI;IAuBtB
|
|
1
|
+
{"version":3,"file":"output-widget.d.ts","sourceRoot":"","sources":["../../src/browser/output-widget.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,27 +75,34 @@ let OutputWidget = class OutputWidget extends browser_2.BaseWidget {
|
|
|
75
75
|
this.refreshEditorWidget();
|
|
76
76
|
}
|
|
77
77
|
/**
|
|
78
|
-
* Restore the selected channel from storage
|
|
79
|
-
*
|
|
80
|
-
*
|
|
78
|
+
* Restore the selected channel from storage. This handles the case where the
|
|
79
|
+
* Output widget was closed before the application shut down, so the widget was
|
|
80
|
+
* not in the layout and `storeState`/`restoreState` never ran.
|
|
81
|
+
*
|
|
82
|
+
* Only applies if the manager doesn't already have a selected channel — if it
|
|
83
|
+
* does, something (e.g. a `channel.show()` call) already set the selection
|
|
84
|
+
* before this widget was created, and we should not override it.
|
|
81
85
|
*/
|
|
82
86
|
async restoreSelectedChannelFromStorage() {
|
|
83
87
|
const storedChannelName = await this.storageService.getData(OutputWidget_1.SELECTED_CHANNEL_STORAGE_KEY);
|
|
84
|
-
|
|
85
|
-
|
|
88
|
+
if (storedChannelName
|
|
89
|
+
&& !this._state.selectedChannelName
|
|
90
|
+
&& !this._state.pendingSelectedChannelName
|
|
91
|
+
&& !this.outputChannelManager.selectedChannel) {
|
|
86
92
|
const channel = this.outputChannelManager.getVisibleChannels().find(ch => ch.name === storedChannelName);
|
|
87
93
|
if (channel) {
|
|
88
94
|
this.outputChannelManager.selectedChannel = channel;
|
|
89
95
|
this.refreshEditorWidget();
|
|
90
96
|
}
|
|
91
97
|
else {
|
|
92
|
-
// Channel not yet available, store as pending
|
|
93
98
|
this._state = { ...this._state, pendingSelectedChannelName: storedChannelName };
|
|
94
99
|
}
|
|
95
100
|
}
|
|
101
|
+
// If no restoration occurred and nothing else has set a selection,
|
|
102
|
+
// fall back to the first visible channel so the widget isn't empty.
|
|
103
|
+
this.ensureChannelSelected();
|
|
96
104
|
}
|
|
97
105
|
dispose() {
|
|
98
|
-
// Save the selected channel to storage before disposing
|
|
99
106
|
const channelName = this.selectedChannel?.name;
|
|
100
107
|
if (channelName) {
|
|
101
108
|
this.storageService.setData(OutputWidget_1.SELECTED_CHANNEL_STORAGE_KEY, channelName);
|
|
@@ -261,6 +268,18 @@ let OutputWidget = class OutputWidget extends browser_2.BaseWidget {
|
|
|
261
268
|
}
|
|
262
269
|
}
|
|
263
270
|
}
|
|
271
|
+
/**
|
|
272
|
+
* If no channel is currently selected, select the first visible channel
|
|
273
|
+
* as a default so the widget shows content rather than an empty view.
|
|
274
|
+
*/
|
|
275
|
+
ensureChannelSelected() {
|
|
276
|
+
if (!this.outputChannelManager.selectedChannel) {
|
|
277
|
+
const firstVisible = this.outputChannelManager.getVisibleChannels()[0];
|
|
278
|
+
if (firstVisible) {
|
|
279
|
+
this.outputChannelManager.selectedChannel = firstVisible;
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
}
|
|
264
283
|
get selectedChannel() {
|
|
265
284
|
return this.outputChannelManager.selectedChannel;
|
|
266
285
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output-widget.js","sourceRoot":"","sources":["../../src/browser/output-widget.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"output-widget.js","sourceRoot":"","sources":["../../src/browser/output-widget.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/output",
|
|
3
|
-
"version": "1.72.
|
|
3
|
+
"version": "1.72.1",
|
|
4
4
|
"description": "Theia - Output Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.72.
|
|
7
|
-
"@theia/editor": "1.72.
|
|
8
|
-
"@theia/monaco": "1.72.
|
|
6
|
+
"@theia/core": "1.72.1",
|
|
7
|
+
"@theia/editor": "1.72.1",
|
|
8
|
+
"@theia/monaco": "1.72.1",
|
|
9
9
|
"@theia/monaco-editor-core": "1.108.201",
|
|
10
10
|
"p-queue": "^8.1.1",
|
|
11
11
|
"tslib": "^2.8.1"
|
|
@@ -44,10 +44,10 @@
|
|
|
44
44
|
"watch": "theiaext watch"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@theia/ext-scripts": "1.
|
|
47
|
+
"@theia/ext-scripts": "1.72.1"
|
|
48
48
|
},
|
|
49
49
|
"nyc": {
|
|
50
50
|
"extends": "../../configs/nyc.json"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "037c4b3e52055fc9962c9761564f431fc4864eb4"
|
|
53
53
|
}
|
|
@@ -78,9 +78,6 @@ export class OutputChannelManager implements Disposable, ResourceResolver {
|
|
|
78
78
|
const channel = this.createChannel(resource);
|
|
79
79
|
this.channels.set(name, channel);
|
|
80
80
|
this.toDisposeOnChannelDeletion.set(name, this.registerListeners(channel));
|
|
81
|
-
if (!this.selectedChannel) {
|
|
82
|
-
this.selectedChannel = channel;
|
|
83
|
-
}
|
|
84
81
|
this.channelAddedEmitter.fire(channel);
|
|
85
82
|
return channel;
|
|
86
83
|
}
|
|
@@ -19,9 +19,9 @@ import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'
|
|
|
19
19
|
import { Emitter } from '@theia/core/lib/common/event';
|
|
20
20
|
import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
21
21
|
import { SelectComponent, SelectOption } from '@theia/core/lib/browser/widgets/select-component';
|
|
22
|
+
import { WidgetManager } from '@theia/core/lib/browser/widget-manager';
|
|
22
23
|
import { OutputWidget } from './output-widget';
|
|
23
24
|
import { OutputCommands } from './output-commands';
|
|
24
|
-
import { OutputContribution } from './output-contribution';
|
|
25
25
|
import { OutputChannelManager } from './output-channel';
|
|
26
26
|
import { nls } from '@theia/core/lib/common/nls';
|
|
27
27
|
|
|
@@ -31,8 +31,8 @@ export class OutputToolbarContribution implements TabBarToolbarContribution {
|
|
|
31
31
|
@inject(OutputChannelManager)
|
|
32
32
|
protected readonly outputChannelManager: OutputChannelManager;
|
|
33
33
|
|
|
34
|
-
@inject(
|
|
35
|
-
protected readonly
|
|
34
|
+
@inject(WidgetManager)
|
|
35
|
+
protected readonly widgetManager: WidgetManager;
|
|
36
36
|
|
|
37
37
|
protected readonly onOutputWidgetStateChangedEmitter = new Emitter<void>();
|
|
38
38
|
protected readonly onOutputWidgetStateChanged = this.onOutputWidgetStateChangedEmitter.event;
|
|
@@ -42,8 +42,10 @@ export class OutputToolbarContribution implements TabBarToolbarContribution {
|
|
|
42
42
|
|
|
43
43
|
@postConstruct()
|
|
44
44
|
protected init(): void {
|
|
45
|
-
this.
|
|
46
|
-
|
|
45
|
+
this.widgetManager.onDidCreateWidget(({ factoryId, widget }) => {
|
|
46
|
+
if (factoryId === OutputWidget.ID && widget instanceof OutputWidget) {
|
|
47
|
+
widget.onStateChanged(() => this.onOutputWidgetStateChangedEmitter.fire());
|
|
48
|
+
}
|
|
47
49
|
});
|
|
48
50
|
const fireChannelsChanged = () => this.onChannelsChangedEmitter.fire();
|
|
49
51
|
this.outputChannelManager.onSelectedChannelChanged(fireChannelsChanged);
|
|
@@ -91,27 +91,35 @@ export class OutputWidget extends BaseWidget implements StatefulWidget {
|
|
|
91
91
|
}
|
|
92
92
|
|
|
93
93
|
/**
|
|
94
|
-
* Restore the selected channel from storage
|
|
95
|
-
*
|
|
96
|
-
*
|
|
94
|
+
* Restore the selected channel from storage. This handles the case where the
|
|
95
|
+
* Output widget was closed before the application shut down, so the widget was
|
|
96
|
+
* not in the layout and `storeState`/`restoreState` never ran.
|
|
97
|
+
*
|
|
98
|
+
* Only applies if the manager doesn't already have a selected channel — if it
|
|
99
|
+
* does, something (e.g. a `channel.show()` call) already set the selection
|
|
100
|
+
* before this widget was created, and we should not override it.
|
|
97
101
|
*/
|
|
98
102
|
protected async restoreSelectedChannelFromStorage(): Promise<void> {
|
|
99
103
|
const storedChannelName = await this.storageService.getData<string>(OutputWidget.SELECTED_CHANNEL_STORAGE_KEY);
|
|
100
|
-
|
|
101
|
-
|
|
104
|
+
if (storedChannelName
|
|
105
|
+
&& !this._state.selectedChannelName
|
|
106
|
+
&& !this._state.pendingSelectedChannelName
|
|
107
|
+
&& !this.outputChannelManager.selectedChannel
|
|
108
|
+
) {
|
|
102
109
|
const channel = this.outputChannelManager.getVisibleChannels().find(ch => ch.name === storedChannelName);
|
|
103
110
|
if (channel) {
|
|
104
111
|
this.outputChannelManager.selectedChannel = channel;
|
|
105
112
|
this.refreshEditorWidget();
|
|
106
113
|
} else {
|
|
107
|
-
// Channel not yet available, store as pending
|
|
108
114
|
this._state = { ...this._state, pendingSelectedChannelName: storedChannelName };
|
|
109
115
|
}
|
|
110
116
|
}
|
|
117
|
+
// If no restoration occurred and nothing else has set a selection,
|
|
118
|
+
// fall back to the first visible channel so the widget isn't empty.
|
|
119
|
+
this.ensureChannelSelected();
|
|
111
120
|
}
|
|
112
121
|
|
|
113
122
|
override dispose(): void {
|
|
114
|
-
// Save the selected channel to storage before disposing
|
|
115
123
|
const channelName = this.selectedChannel?.name;
|
|
116
124
|
if (channelName) {
|
|
117
125
|
this.storageService.setData(OutputWidget.SELECTED_CHANNEL_STORAGE_KEY, channelName);
|
|
@@ -293,6 +301,19 @@ export class OutputWidget extends BaseWidget implements StatefulWidget {
|
|
|
293
301
|
}
|
|
294
302
|
}
|
|
295
303
|
|
|
304
|
+
/**
|
|
305
|
+
* If no channel is currently selected, select the first visible channel
|
|
306
|
+
* as a default so the widget shows content rather than an empty view.
|
|
307
|
+
*/
|
|
308
|
+
protected ensureChannelSelected(): void {
|
|
309
|
+
if (!this.outputChannelManager.selectedChannel) {
|
|
310
|
+
const firstVisible = this.outputChannelManager.getVisibleChannels()[0];
|
|
311
|
+
if (firstVisible) {
|
|
312
|
+
this.outputChannelManager.selectedChannel = firstVisible;
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
|
|
296
317
|
private get selectedChannel(): OutputChannel | undefined {
|
|
297
318
|
return this.outputChannelManager.selectedChannel;
|
|
298
319
|
}
|