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

Enable support for plain-md code evaluataion #2920

Merged
merged 2 commits into from Jun 17, 2022
Merged

Enable support for plain-md code evaluataion #2920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d64d785
Enable support for plain-md code evaluataion
pfitzseb Jun 13, 2022
6a4981d
Fix package.json
pfitzseb Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions package.json
View file
Open in desktop
Expand Up @@ -724,22 +724,22 @@
{
"command": "language-julia.executeCodeBlockOrSelectionAndMove",
"key": "Shift+Enter",
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown"
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown || editorLangId == markdown"
},
{
"command": "language-julia.executeCodeBlockOrSelection",
"key": "Ctrl+Enter",
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown"
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown || editorLangId == markdown"
},
{
"command": "language-julia.executeCell",
"key": "Alt+Enter",
"when": "editorTextFocus &&activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown"
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown || editorLangId == markdown"
},
{
"command": "language-julia.executeCellAndMove",
"key": "Alt+Shift+Enter",
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown"
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown || editorLangId == markdown"
},
{
"command": "language-julia.interrupt",
Expand All @@ -749,17 +749,17 @@
{
"command": "language-julia.clearCurrentInlineResult",
"key": "Escape",
"when": "editorTextFocus && !editorHasSelection && !findWidgetVisible && !markerNavigationVisible && !parameterHintsVisible && !inSnippetMode && !isInEmbeddedEditor && !suggestWidgetVisible && !onTypeRenameInputVisible && !renameInputVisible && juliaHasInlineResult && editorLangId == julia || editorLangId == juliamarkdown"
"when": "editorTextFocus && !editorHasSelection && !findWidgetVisible && !markerNavigationVisible && !parameterHintsVisible && !inSnippetMode && !isInEmbeddedEditor && !suggestWidgetVisible && !onTypeRenameInputVisible && !renameInputVisible && juliaHasInlineResult && editorLangId == julia || editorLangId == juliamarkdown || editorLangId == markdown"
},
{
"command": "language-julia.clearAllInlineResultsInEditor",
"key": "Ctrl+I Ctrl+C",
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown"
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown || editorLangId == markdown"
},
{
"command": "language-julia.chooseModule",
"key": "Alt+J Alt+M",
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown"
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown || editorLangId == markdown"
},
{
"command": "language-julia.newJuliaFile",
Expand All @@ -780,12 +780,12 @@
{
"command": "language-julia.changeCurrentEnvironment",
"key": "Alt+J Alt+E",
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown"
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown || editorLangId == markdown"
},
{
"command": "language-julia.show-documentation",
"key": "Alt+J Alt+D",
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown"
"when": "editorTextFocus && activeEditor != workbench.editor.notebook && editorLangId == julia || editorLangId == juliamarkdown || editorLangId == markdown"
},
{
"key": "Alt+J Alt+P",
Expand Down
5 changes: 3 additions & 2 deletions src/extension.ts
View file
Open in desktop
Expand Up @@ -214,7 +214,8 @@ const supportedSchemes = [

const supportedLanguages = [
'julia',
'juliamarkdown'
'juliamarkdown',
'markdown'
]

async function startLanguageServer(juliaExecutablesFeature: JuliaExecutablesFeature) {
Expand Down Expand Up @@ -310,7 +311,7 @@ async function startLanguageServer(juliaExecutablesFeature: JuliaExecutablesFeat
const clientOptions: LanguageClientOptions = {
documentSelector: selector,
synchronize: {
fileEvents: vscode.workspace.createFileSystemWatcher('**/*.{jl,jmd}')
fileEvents: vscode.workspace.createFileSystemWatcher('**/*.{jl,jmd,md}')
},
revealOutputChannelOn: RevealOutputChannelOn.Never,
traceOutputChannel: g_traceOutputChannel,
Expand Down
52 changes: 29 additions & 23 deletions src/interactive/repl.ts
View file
Open in desktop
Expand Up @@ -599,13 +599,13 @@ async function executeFile(uri?: vscode.Uri | string) {
uri = vscode.Uri.parse(uri)
}

let isJMD = false
let isJmd = false

if (uri && uri instanceof vscode.Uri) {
path = uri.fsPath
const readBytes = await vscode.workspace.fs.readFile(uri)
code = Buffer.from(readBytes).toString('utf8')
isJMD = path.endsWith('.jmd')
isJmd = path.endsWith('.jmd') || path.endsWith('.md')
} else {
if (!editor) {
return
Expand All @@ -615,11 +615,11 @@ async function executeFile(uri?: vscode.Uri | string) {

const pos = editor.document.validatePosition(new vscode.Position(0, 1)) // xref: https://github.com/julia-vscode/julia-vscode/issues/1500
module = await modules.getModuleForEditor(editor.document, pos)
isJMD = editor.document.languageId === 'juliamarkdown'
isJmd = isMarkdownEditor(editor)
}

// strip out non-code-block condent for JMD files:
if (isJMD) {
if (isJmd) {
code = stripMarkdown(code)
}

Expand Down Expand Up @@ -716,7 +716,7 @@ async function moveCellDown() {
if (ed === undefined) {
return
}
const isJmd = ed.document.languageId === 'juliamarkdown'
const isJmd = isMarkdownEditor(ed)
const currline = ed.selection.active.line
const newpos = new vscode.Position(nextCellBorder(ed.document, currline + 1, true, isJmd) + 1, 0)
validateMoveAndReveal(ed, newpos, newpos)
Expand All @@ -728,7 +728,7 @@ async function moveCellUp() {
if (ed === undefined) {
return
}
const isJmd = ed.document.languageId === 'juliamarkdown'
const isJmd = isMarkdownEditor(ed)
const currline = ed.selection.active.line

let newpos: vscode.Position
Expand All @@ -750,7 +750,7 @@ async function moveCellUp() {
function currentCellRange(editor: vscode.TextEditor) {
const doc = editor.document
const currline = editor.selection.active.line
const isJmd = doc.languageId === 'juliamarkdown'
const isJmd = isMarkdownEditor(editor)
const startline = prevCellBorder(doc, currline, true, isJmd) + 1
if (isJmd && startline === 0) {
return null
Expand Down Expand Up @@ -787,33 +787,35 @@ async function executeCell(shouldMove: boolean = false) {
await startREPL(true, false)

if (shouldMove && ed.selection === selection) {
const isJmd = doc.languageId === 'juliamarkdown'
const isJmd = isMarkdownEditor(ed)
const nextpos = new vscode.Position(nextCellBorder(doc, cellrange.end.line + 1, true, isJmd) + 1, 0)
validateMoveAndReveal(ed, nextpos, nextpos)
}
if (vscode.workspace.getConfiguration('julia').get<boolean>('execution.inlineResultsForCellEvaluation') === true) {
let currentPos: vscode.Position = ed.document.validatePosition(new vscode.Position(cellrange.start.line , cellrange.start.character))
let currentPos: vscode.Position = ed.document.validatePosition(new vscode.Position(cellrange.start.line , cellrange.start.character + 1))
let lastRange = new vscode.Range(0, 0, 0, 0)
while (currentPos.line <= cellrange.end.line) {
const [startPos, endPos, nextPos] = await getBlockRange(getVersionedParamsAtPosition(ed.document, currentPos))
const lineEndPos = ed.document.validatePosition(new vscode.Position(endPos.line, Infinity))
const curRange = new vscode.Range(startPos, lineEndPos)
const curRange = cellrange.intersection(new vscode.Range(startPos, lineEndPos))
if (curRange === undefined || curRange.isEqual(lastRange)) {
break
}
lastRange = curRange
if (curRange.isEmpty) {
continue
}
currentPos = ed.document.validatePosition(nextPos)
const code = doc.getText(curRange)

const connection_available = await evaluate(ed, curRange, code, module)
if (!connection_available) {
await vscode.window.showErrorMessage('Could not evaluate Julia code because the REPL is no longer available.')
const success = await evaluate(ed, curRange, code, module)
if (!success) {
break
}
}
} else {
const code = doc.getText(cellrange)
const connection_available = await evaluate(ed, cellrange, code, module)
if (!connection_available) {
await vscode.window.showErrorMessage('Could not evaluate Julia code because the REPL is no longer available.')
}
await evaluate(ed, cellrange, code, module)
}
}

Expand Down Expand Up @@ -868,10 +870,9 @@ async function evaluateBlockOrSelection(shouldMove: boolean = false) {
editor.setDecorations(tempDecoration, [])
}, 200)

const connection_available = await evaluate(editor, range, text, module)
const success = await evaluate(editor, range, text, module)

if (!connection_available) {
vscode.window.showErrorMessage('Could not evaluate code because the Julia REPL is no longer available.')
if (!success) {
break
}
}
Expand Down Expand Up @@ -908,19 +909,20 @@ async function evaluate(editor: vscode.TextEditor, range: vscode.Range, text: st
softscope: true
}
)
const isError = Boolean(result.stackframe)

if (resultType !== 'REPL') {
if (r.destroyed) {
r = results.addResult(editor, range, '', '')
}
if (result.stackframe) {
if (isError) {
results.clearStackTrace()
results.setStackTrace(r, result.all, result.stackframe)
}
r.setContent(results.resultContent(' ' + result.inline + ' ', result.all, Boolean(result.stackframe)))
r.setContent(results.resultContent(' ' + result.inline + ' ', result.all, isError))
}

return true
return !isError
} catch (err) {
r.remove(true)
throw(err)
Expand Down Expand Up @@ -1156,6 +1158,10 @@ function updateCellDelimiters() {
}
}

function isMarkdownEditor(editor: vscode.TextEditor) {
return editor.document.languageId === 'juliamarkdown' || editor.document.languageId === 'markdown'
}

export async function replStartDebugger(pipename: string) {
await startREPL(true)

Expand Down