Skip to content

make indents work with tabs, other whitespace chrs #23

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

Open
TheV360 wants to merge 5 commits into
base: cactus
Choose a base branch
from
Open

make indents work with tabs, other whitespace chrs #23

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a411b74
make indents work with tabs, other whitespace chrs
TheV360 Sep 4, 2024
3d9ff7a
use given "horizontal whitespace" regex
TheV360 Sep 4, 2024
280eb11
use "horiz. whitespace" macro for skipping spaces
TheV360 Sep 4, 2024
4164b23
undo unneeded change
TheV360 Sep 4, 2024
fec5108
unuse given "horizontal whitespace" regex
TheV360 Sep 5, 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
15 changes: 8 additions & 7 deletions parse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class Markup_12y2 { constructor() {
'{EOL}': "(?![^\\n])",
'{BOL}': "^",
'{ANY}': "[^]",
'{HORIZ_WS}': "[ \t]",
'{URL_CHARS}': "[-\\w/%&=#+~@$*'!?,.;:]*",
'{URL_FINAL}': "[-\\w/%&=#+~@$*']",
}
Expand Down Expand Up @@ -42,9 +43,9 @@ class Markup_12y2 { constructor() {
`[\`][^\`\n]*([\`]{2}[^\`\n]*)*[\`]?${'INLINE_CODE'}`
`([!]${'EMBED'})?\b(https?://|sbs:){URL_CHARS}{URL_FINAL}([(]{URL_CHARS}[)]({URL_CHARS}{URL_FINAL})?)?${'LINK'}`
`{BOL}[|][-][-+]*[-][|]{EOL}${'TABLE_DIVIDER'}` // `{BOL}[|][|][|]{EOL}${'TABLE_DIVIDER'}`
`{BOL} *[|]${'TABLE_START'}`
` *[|][|]?${'TABLE_CELL'}`
`{BOL} *[-]${'LIST_ITEM'}`
`{BOL}{HORIZ_WS}*[|]${'TABLE_START'}`
`{HORIZ_WS}*[|][|]?${'TABLE_CELL'}`
`{BOL}{HORIZ_WS}*[-]${'LIST_ITEM'}`
()

//todo: org tables separators?
Expand Down Expand Up @@ -314,6 +315,7 @@ class Markup_12y2 { constructor() {
const ARG_REGEX = /.*?(?=])/y
const WORD_REGEX = /[^\s`^()+=\[\]{}\\|"';:,.<>/?!*]*/y
const CODE_REGEX = /(?: *([-\w.+#$ ]+?) *(?![^\n]))?\n?([^]*?)(?:\n?```|$)/y // ack
const SPACE_REGEX = new RegExp(`${MACROS['{HORIZ_WS}']}*`, 'y')

const parse=(text)=>{
let tree = {type: 'ROOT', content: [], prev: 'all_newline'}
Expand All @@ -322,10 +324,9 @@ class Markup_12y2 { constructor() {

// these use REGEX, text
const skip_spaces=()=>{
let pos = REGEX.lastIndex
while (" "===text.charAt(pos))
pos++
REGEX.lastIndex = pos
SPACE_REGEX.lastIndex = REGEX.lastIndex
SPACE_REGEX.exec(text)
REGEX.lastIndex = SPACE_REGEX.lastIndex
}
const read_code=()=>{
let pos = REGEX.lastIndex
Expand Down