neil/silverbullet
1
0
Fork 0
Code

Attempt to fix line wrapper bugs

Browse Source
This commit is contained in:
Zef Hemel 2022-08-02 12:44:41 +02:00
parent 36004a7977
commit 9f7b59905a
2 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/web/line_wrapper.ts
View File

@ -18,11 +18,13 @@ interface WrapElement {
function wrapLines(view: EditorView, wrapElements: WrapElement[]) { function wrapLines(view: EditorView, wrapElements: WrapElement[]) {
let widgets: Range<Decoration>[] = []; let widgets: Range<Decoration>[] = [];
let elementStack: string[] = []; let elementStack: string[] = [];
for (let { from, to } of view.visibleRanges) {
const doc = view.state.doc; const doc = view.state.doc;
// Disabling the visible ranges for now, because it may be a bit buggy.
// RISK: this may actually become slow for large documents.
// for (let { from, to } of view.visibleRanges) {
syntaxTree(view.state).iterate({ syntaxTree(view.state).iterate({
from, // from,
to, // to,
enter: ({ type, from, to }) => { enter: ({ type, from, to }) => {
for (let wrapElement of wrapElements) { for (let wrapElement of wrapElements) {
if (type.name == wrapElement.selector) { if (type.name == wrapElement.selector) {
@ -54,7 +56,7 @@ function wrapLines(view: EditorView, wrapElements: WrapElement[]) {
} }
}, },
}); });
} // }
// Widgets have to be sorted by `from` in ascending order // Widgets have to be sorted by `from` in ascending order
widgets = widgets.sort((a, b) => { widgets = widgets.sort((a, b) => {
return a.from < b.from ? -1 : 1; return a.from < b.from ? -1 : 1;

6
packages/web/styles/editor.scss
View File

@ -1,12 +1,7 @@
@import "constants.scss"; @import "constants.scss";
//div.rhs-open #editor .cm-editor .cm-content {
// max-width: 550px;
//}
.cm-editor { .cm-editor {
font-size: var(--ident); font-size: var(--ident);
//overflow-y: hidden;
padding: 0 20px; padding: 0 20px;
.cm-content { .cm-content {
@ -256,7 +251,6 @@
color: #989797; color: #989797;
background-color: rgba(210, 210, 210, 0.2); background-color: rgba(210, 210, 210, 0.2);
border-radius: 5px; border-radius: 5px;
// font-style: italic;
font-size: 75%; font-size: 75%;
line-height: 75%; line-height: 75%;
} }