@theia/monaco 1.68.0 → 1.68.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-diff-editor.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAe,8BAA8B,EAAE,MAAM,+DAA+D,CAAC;AAC5H,OAAO,EAA4C,qBAAqB,EAA+C,MAC9G,iFAAiF,CAAC;AAQ3F,OAAO,EAAE,cAAc,EAAE,MAAM,qEAAqE,CAAC;AACrG,OAAO,EAAE,WAAW,EAAE,MAAM,6EAA6E,CAAC;AAE1G,yBAAiB,gBAAgB,CAAC;IAC9B,UAAiB,QAAS,SAAQ,YAAY,CAAC,cAAc,EAAE,8BAA8B;KAC5F;CACJ;AAED,qBAAa,gBAAiB,SAAQ,YAAY;IAQ1C,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IACzC,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IAEzC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,0BAA0B;IAVvE,SAAS,CAAC,WAAW,EAAE,qBAAqB,CAAC;IAC7C,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAG/D,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,WAAW,EACR,aAAa,EAAE,iBAAiB,EAChC,aAAa,EAAE,iBAAiB,EACzC,QAAQ,EAAE,oBAAoB,EACX,oBAAoB,EAAE,0BAA0B,EACnE,OAAO,CAAC,EAAE,gBAAgB,CAAC,QAAQ,EACnC,QAAQ,CAAC,EAAE,sBAAsB,EACjC,YAAY,CAAC,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"monaco-diff-editor.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAe,8BAA8B,EAAE,MAAM,+DAA+D,CAAC;AAC5H,OAAO,EAA4C,qBAAqB,EAA+C,MAC9G,iFAAiF,CAAC;AAQ3F,OAAO,EAAE,cAAc,EAAE,MAAM,qEAAqE,CAAC;AACrG,OAAO,EAAE,WAAW,EAAE,MAAM,6EAA6E,CAAC;AAE1G,yBAAiB,gBAAgB,CAAC;IAC9B,UAAiB,QAAS,SAAQ,YAAY,CAAC,cAAc,EAAE,8BAA8B;KAC5F;CACJ;AAED,qBAAa,gBAAiB,SAAQ,YAAY;IAQ1C,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IACzC,QAAQ,CAAC,aAAa,EAAE,iBAAiB;IAEzC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,0BAA0B;IAVvE,SAAS,CAAC,WAAW,EAAE,qBAAqB,CAAC;IAC7C,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAG/D,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,WAAW,EACR,aAAa,EAAE,iBAAiB,EAChC,aAAa,EAAE,iBAAiB,EACzC,QAAQ,EAAE,oBAAoB,EACX,oBAAoB,EAAE,0BAA0B,EACnE,OAAO,CAAC,EAAE,gBAAgB,CAAC,QAAQ,EACnC,QAAQ,CAAC,EAAE,sBAAsB,EACjC,YAAY,CAAC,EAAE,YAAY;IAc/B,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAEpD;IAED,IAAI,aAAa,IAAI,aAAa,CAEjC;IAED,IAAI,eAAe,IAAI,WAAW,EAAE,CAEnC;cAEkB,MAAM,CAAC,OAAO,CAAC,EAAE,8BAA8B,EAAE,QAAQ,CAAC,EAAE,sBAAsB,GAAG,UAAU;IAclH,SAAS,CAAC,gBAAgB,EAAE,cAAc,CAAC,mBAAmB,CAAC,CAAC;IAChE,SAAS,CAAC,+BAA+B,UAAQ;cAC9B,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,IAAI;IAenD,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAKtC,gBAAgB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,EAAE;IAKzD,cAAc,IAAI,GAAG;IAGrB,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG;IAK/C,SAAkB,+BAA+B,YAAa;IACrD,sBAAsB,IAAI,OAAO;IAGjC,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAIxD,cAAuB,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAEzD;IAED,cAAuB,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAE7D;CACJ"}
|
|
@@ -34,6 +34,11 @@ class MonacoDiffEditor extends monaco_editor_1.MonacoEditor {
|
|
|
34
34
|
this.documents.add(originalModel);
|
|
35
35
|
this.wordWrapOverride = options?.wordWrapOverride2;
|
|
36
36
|
this._diffNavigator = diffNavigatorFactory.createdDiffNavigator(this._diffEditor);
|
|
37
|
+
if (parentEditor) {
|
|
38
|
+
// Embedded diff editors don't participate in visibility tracking (they're not wrapped in EditorWidget),
|
|
39
|
+
// so we need to set the model immediately since handleVisibilityChanged will never be called.
|
|
40
|
+
this.diffEditor.setModel(this.diffEditorModel);
|
|
41
|
+
}
|
|
37
42
|
}
|
|
38
43
|
get diffEditor() {
|
|
39
44
|
return this._diffEditor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-diff-editor.js","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.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,oDAA6C;AAI7C,mDAA6F;AAE7F,iEAA6D;AAG7D,0HAC2F;AAE3F,yIAAsI;AAKtI,wGAAqG;AASrG,MAAa,gBAAiB,SAAQ,4BAAY;IAK9C,YACI,GAAQ,EACR,IAAiB,EACR,aAAgC,EAChC,aAAgC,EACzC,QAA8B,EACX,oBAAgD,EACnE,OAAmC,EACnC,QAAiC,EACjC,YAA2B;QAE3B,KAAK,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QARlE,kBAAa,GAAb,aAAa,CAAmB;QAChC,kBAAa,GAAb,aAAa,CAAmB;QAEtB,yBAAoB,GAApB,oBAAoB,CAA4B;
|
|
1
|
+
{"version":3,"file":"monaco-diff-editor.js","sourceRoot":"","sources":["../../src/browser/monaco-diff-editor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/monaco",
|
|
3
|
-
"version": "1.68.
|
|
3
|
+
"version": "1.68.1",
|
|
4
4
|
"description": "Theia - Monaco Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.68.
|
|
7
|
-
"@theia/editor": "1.68.
|
|
8
|
-
"@theia/filesystem": "1.68.
|
|
9
|
-
"@theia/markers": "1.68.
|
|
6
|
+
"@theia/core": "1.68.1",
|
|
7
|
+
"@theia/editor": "1.68.1",
|
|
8
|
+
"@theia/filesystem": "1.68.1",
|
|
9
|
+
"@theia/markers": "1.68.1",
|
|
10
10
|
"@theia/monaco-editor-core": "1.96.302",
|
|
11
|
-
"@theia/outline-view": "1.68.
|
|
12
|
-
"@theia/workspace": "1.68.
|
|
11
|
+
"@theia/outline-view": "1.68.1",
|
|
12
|
+
"@theia/workspace": "1.68.1",
|
|
13
13
|
"fast-plist": "^0.1.2",
|
|
14
14
|
"idb": "^4.0.5",
|
|
15
15
|
"jsonc-parser": "^2.2.0",
|
|
@@ -52,10 +52,10 @@
|
|
|
52
52
|
"watch": "theiaext watch"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@theia/ext-scripts": "1.68.
|
|
55
|
+
"@theia/ext-scripts": "1.68.1"
|
|
56
56
|
},
|
|
57
57
|
"nyc": {
|
|
58
58
|
"extends": "../../configs/nyc.json"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "d1eb23a174e0096923ce08666ae35ce9762a0b81"
|
|
61
61
|
}
|
|
@@ -61,6 +61,11 @@ export class MonacoDiffEditor extends MonacoEditor {
|
|
|
61
61
|
this.documents.add(originalModel);
|
|
62
62
|
this.wordWrapOverride = options?.wordWrapOverride2;
|
|
63
63
|
this._diffNavigator = diffNavigatorFactory.createdDiffNavigator(this._diffEditor);
|
|
64
|
+
if (parentEditor) {
|
|
65
|
+
// Embedded diff editors don't participate in visibility tracking (they're not wrapped in EditorWidget),
|
|
66
|
+
// so we need to set the model immediately since handleVisibilityChanged will never be called.
|
|
67
|
+
this.diffEditor.setModel(this.diffEditorModel);
|
|
68
|
+
}
|
|
64
69
|
}
|
|
65
70
|
|
|
66
71
|
get diffEditor(): monaco.editor.IStandaloneDiffEditor {
|