Skip to content

Commit 657df02

Browse files
committed
Merge remote-tracking branch 'origin/master' into fix-i18n-timetravel
2 parents 2140f8a + c2c9744 commit 657df02

File tree

12 files changed

+30
-20
lines changed

12 files changed

+30
-20
lines changed

src/packages/frontend/codemirror/util.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { set, get, del } from "@cocalc/frontend/misc/local-storage-typed";
22
import { isEqual } from "lodash";
33

44
export function getFoldedLines(cm): number[] {
5-
if (cm.foldCode == null) {
5+
if (cm?.foldCode == null) {
66
// not enabled
77
return [];
88
}
@@ -13,7 +13,7 @@ export function getFoldedLines(cm): number[] {
1313
}
1414

1515
export function setFoldedLines(cm, lines: number[]) {
16-
if (cm.foldCode == null) {
16+
if (cm?.foldCode == null) {
1717
// not enabled
1818
return;
1919
}

src/packages/frontend/components/link-retry.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ interface Props {
2424
onClick?: () => void;
2525
autoStart?: boolean;
2626
maxTime?: number;
27-
tooltip?: string;
27+
tooltip?: React.ReactNode;
2828
}
2929

3030
const LinkRetry: React.FC<Props> = ({

src/packages/frontend/frame-editors/code-editor/codemirror-editor.tsx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import { GutterMarkers } from "./codemirror-gutter-markers";
3636
import { Actions } from "./actions";
3737
import { EditorState } from "../frame-tree/types";
3838
import { Path } from "../frame-tree/path";
39+
import { initFold, saveFold } from "@cocalc/frontend/codemirror/util";
3940

4041
const STYLE = {
4142
width: "100%",
@@ -290,6 +291,16 @@ export const CodemirrorEditor: React.FC<Props> = React.memo((props) => {
290291
}
291292
cmRef.current.setOption("readOnly", props.read_only);
292293
cm_refresh();
294+
295+
const foldKey = `${props.path}\\${props.id}`;
296+
const saveFoldState = () => {
297+
if (cmRef.current != null) {
298+
saveFold(cmRef.current,foldKey);
299+
}
300+
};
301+
cmRef.current.on("fold" as any, saveFoldState);
302+
cmRef.current.on("unfold" as any, saveFoldState);
303+
initFold(cmRef.current, foldKey);
293304
}
294305

295306
function init_new_codemirror(): void {

src/packages/frontend/i18n/bin/common.sh

100644100755
File mode changed.

src/packages/frontend/i18n/bin/compile.sh

100644100755
File mode changed.

src/packages/frontend/i18n/bin/download.sh

100644100755
File mode changed.

src/packages/frontend/i18n/bin/extract.sh

100644100755
File mode changed.

src/packages/frontend/i18n/bin/upload.sh

100644100755
File mode changed.

src/packages/frontend/i18n/extracted.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@
560560
"defaultMessage": "Describe the problem of that cell in order to get a bugfixed version."
561561
},
562562
"jupyter.llm.dell-tool.actions.bugfix.label": {
563-
"defaultMessage": "Explain"
563+
"defaultMessage": "Fix Bugs"
564564
},
565565
"jupyter.llm.dell-tool.actions.document.descr": {
566566
"defaultMessage": "Add documentation"

src/packages/frontend/jupyter/llm/cell-tool.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ const ACTIONS: { [mode in Mode]: LLMTool } = {
158158
icon: "clean-outlined",
159159
label: defineMessage({
160160
id: "jupyter.llm.dell-tool.actions.bugfix.label",
161-
defaultMessage: "Explain",
161+
defaultMessage: "Fix Bugs",
162162
}),
163163
descr: defineMessage({
164164
id: "jupyter.llm.dell-tool.actions.bugfix.descr",

0 commit comments

Comments
 (0)