Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/md parsing #1513

Merged
merged 5 commits into from
May 13, 2024
Merged

Fix/md parsing #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e608ddf
Revert "🧰: update md parsing code from codemirror to fix blockquotes …
linusha May 13, 2024
20f6f02
🧰: lint `md/mode.js`
linusha May 13, 2024
b806b65
🧰: properly call `blankLine` function when parsing an empty line
linusha May 13, 2024
2a43c26
🧰: properly call `blankLine` function when parsing an empty line
linusha May 13, 2024
8254f4a
🧰: keep syntax highlighting alive when encountering unexpected token
linusha May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lively.ide/editor-modes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,16 @@ function tokenizeLines (mode, lines, _startState, newLineFn, recordFn) {

function tokenizeLine (mode, line, state, recordFn) {
let { text } = line;
if (!text) return state;
let stream = new StringStream(text, 2/* indent...FIXME */);
state = line.modeState = typeof mode.copyState === 'function'
? mode.copyState(state)
: copyState(mode, state);
let tokens = []; let prevLine = line.prevLine();
state._string = text;
if (text === '' && mode.blankLine){
mode.blankLine(state);
return state;
}
while (!stream.eol()) {
let name = mode.token(stream, state);
recordFn(name, state, stream.start, stream.pos, stream, line, mode);
Expand Down
4 changes: 3 additions & 1 deletion lively.ide/md/editor-plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,9 @@ export default class MarkdownEditorPlugin extends CodeMirrorEnabledEditorPlugin
for (let i = 0; i < lineTokens.length; i = i + 5) {
let startColumn = lineTokens[i];
let endColumn = lineTokens[i + 1];
let tokens = (lineTokens[i + 2] || '').split(' ');
let tokens = lineTokens[i + 2];
tokens = tokens?.split ? tokens : '';
tokens = tokens.split(' ');
// style = theme[tokens[0]] || theme.default;

let style;
Expand Down
Loading
Loading