diff --git a/.vscode/settings.json b/.vscode/settings.json index 9dd53fbe..17e5fb08 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,21 @@ { - "AsciiDoc.active_line_color": "Transparent", - "AsciiDoc.path": "${currentFileDir}", "javascript.format.placeOpenBraceOnNewLineForFunctions": true, "javascript.format.placeOpenBraceOnNewLineForControlBlocks": true, "typescript.format.placeOpenBraceOnNewLineForFunctions": true, - "typescript.format.placeOpenBraceOnNewLineForControlBlocks": true -} \ No newline at end of file + "typescript.format.placeOpenBraceOnNewLineForControlBlocks": true, + "cSpell.words": [ + "asciidoctor", + "deserialize", + "helvetica", + "joaompinto", + "junit", + "linkify", + "neue", + "segoe", + "upath", + "webview" + ], + "files.watcherExclude": { + "out/**": true + } +} diff --git a/package.json b/package.json index 87b01f47..bb6c2572 100644 --- a/package.json +++ b/package.json @@ -61,258 +61,258 @@ ], "commands": [ { - "command": "markdown.showPreview", - "title": "%markdown.preview.title%", - "category": "Markdown", + "command": "asciidoc.showPreview", + "title": "%asciidoc.preview.title%", + "category": "AsciiDoc", "icon": { "light": "./media/Preview.svg", "dark": "./media/Preview_inverse.svg" } }, { - "command": "markdown.showPreviewToSide", - "title": "%markdown.previewSide.title%", - "category": "Markdown", + "command": "asciidoc.showPreviewToSide", + "title": "%asciidoc.previewSide.title%", + "category": "AsciiDoc", "icon": { "light": "./media/PreviewOnRightPane_16x.svg", "dark": "./media/PreviewOnRightPane_16x_dark.svg" } }, { - "command": "markdown.showLockedPreviewToSide", - "title": "%markdown.showLockedPreviewToSide.title%", - "category": "Markdown", + "command": "asciidoc.showLockedPreviewToSide", + "title": "%asciidoc.showLockedPreviewToSide.title%", + "category": "AsciiDoc", "icon": { "light": "./media/PreviewOnRightPane_16x.svg", "dark": "./media/PreviewOnRightPane_16x_dark.svg" } }, { - "command": "markdown.showSource", - "title": "%markdown.showSource.title%", - "category": "Markdown", + "command": "asciidoc.showSource", + "title": "%asciidoc.showSource.title%", + "category": "AsciiDoc", "icon": { "light": "./media/ViewSource.svg", "dark": "./media/ViewSource_inverse.svg" } }, { - "command": "markdown.showPreviewSecuritySelector", - "title": "%markdown.showPreviewSecuritySelector.title%", - "category": "Markdown" + "command": "asciidoc.showPreviewSecuritySelector", + "title": "%asciidoc.showPreviewSecuritySelector.title%", + "category": "AsciiDoc" }, { - "command": "markdown.preview.refresh", - "title": "%markdown.preview.refresh.title%", - "category": "Markdown" + "command": "asciidoc.preview.refresh", + "title": "%asciidoc.preview.refresh.title%", + "category": "AsciiDoc" }, { - "command": "markdown.preview.toggleLock", - "title": "%markdown.preview.toggleLock.title%", - "category": "Markdown" + "command": "asciidoc.preview.toggleLock", + "title": "%asciidoc.preview.toggleLock.title%", + "category": "AsciiDoc" } ], "menus": { "editor/title": [ { - "command": "markdown.showPreviewToSide", - "when": "editorLangId == markdown", - "alt": "markdown.showPreview", + "command": "asciidoc.showPreviewToSide", + "when": "editorLangId == asciidoc", + "alt": "asciidoc.showPreview", "group": "navigation" }, { - "command": "markdown.showSource", - "when": "markdownPreviewFocus", + "command": "asciidoc.showSource", + "when": "asciidocPreviewFocus", "group": "navigation" }, { - "command": "markdown.preview.refresh", - "when": "markdownPreviewFocus", - "group": "1_markdown" + "command": "asciidoc.preview.refresh", + "when": "asciidocPreviewFocus", + "group": "1_asciidoc" }, { - "command": "markdown.preview.toggleLock", - "when": "markdownPreviewFocus", - "group": "1_markdown" + "command": "asciidoc.preview.toggleLock", + "when": "asciidocPreviewFocus", + "group": "1_asciidoc" }, { - "command": "markdown.showPreviewSecuritySelector", - "when": "markdownPreviewFocus", - "group": "1_markdown" + "command": "asciidoc.showPreviewSecuritySelector", + "when": "asciidocPreviewFocus", + "group": "1_asciidoc" } ], "explorer/context": [ { - "command": "markdown.showPreview", - "when": "resourceLangId == markdown", + "command": "asciidoc.showPreview", + "when": "resourceLangId == asciidoc", "group": "navigation" } ], "editor/title/context": [ { - "command": "markdown.showPreview", - "when": "resourceLangId == markdown", + "command": "asciidoc.showPreview", + "when": "resourceLangId == asciidoc", "group": "navigation" } ], "commandPalette": [ { - "command": "markdown.showPreview", - "when": "editorLangId == markdown", + "command": "asciidoc.showPreview", + "when": "editorLangId == asciidoc", "group": "navigation" }, { - "command": "markdown.showPreviewToSide", - "when": "editorLangId == markdown", + "command": "asciidoc.showPreviewToSide", + "when": "editorLangId == asciidoc", "group": "navigation" }, { - "command": "markdown.showLockedPreviewToSide", - "when": "editorLangId == markdown", + "command": "asciidoc.showLockedPreviewToSide", + "when": "editorLangId == asciidoc", "group": "navigation" }, { - "command": "markdown.showSource", - "when": "markdownPreviewFocus", + "command": "asciidoc.showSource", + "when": "asciidocPreviewFocus", "group": "navigation" }, { - "command": "markdown.showPreviewSecuritySelector", - "when": "editorLangId == markdown" + "command": "asciidoc.showPreviewSecuritySelector", + "when": "editorLangId == asciidoc" }, { - "command": "markdown.showPreviewSecuritySelector", - "when": "markdownPreviewFocus" + "command": "asciidoc.showPreviewSecuritySelector", + "when": "asciidocPreviewFocus" }, { - "command": "markdown.preview.toggleLock", - "when": "markdownPreviewFocus" + "command": "asciidoc.preview.toggleLock", + "when": "asciidocPreviewFocus" } ] }, "keybindings": [ { - "command": "markdown.showPreview", + "command": "asciidoc.showPreview", "key": "shift+ctrl+v", "mac": "shift+cmd+v", - "when": "editorLangId == markdown" + "when": "editorLangId == asciidoc" }, { - "command": "markdown.showPreviewToSide", + "command": "asciidoc.showPreviewToSide", "key": "ctrl+k v", "mac": "cmd+k v", - "when": "editorLangId == markdown" + "when": "editorLangId == asciidoc" } ], "configuration": { "type": "object", - "title": "Markdown", + "title": "AsciiDoc", "order": 20, "properties": { - "markdown.styles": { + "asciidoc.styles": { "type": "array", "default": [], - "description": "%markdown.styles.dec%", + "description": "%asciidoc.styles.dec%", "scope": "resource" }, - "markdown.previewFrontMatter": { + "asciidoc.previewFrontMatter": { "type": "string", "enum": [ "hide", "show" ], "default": "hide", - "description": "%markdown.previewFrontMatter.dec%", + "description": "%asciidoc.previewFrontMatter.dec%", "scope": "resource" }, - "markdown.preview.breaks": { + "asciidoc.preview.breaks": { "type": "boolean", "default": false, - "description": "%markdown.preview.breaks.desc%", + "description": "%asciidoc.preview.breaks.desc%", "scope": "resource" }, - "markdown.preview.linkify": { + "asciidoc.preview.linkify": { "type": "boolean", "default": true, - "description": "%markdown.preview.linkify%", + "description": "%asciidoc.preview.linkify%", "scope": "resource" }, - "markdown.preview.fontFamily": { + "asciidoc.preview.fontFamily": { "type": "string", "default": "-apple-system, BlinkMacSystemFont, 'Segoe WPC', 'Segoe UI', 'HelveticaNeue-Light', 'Ubuntu', 'Droid Sans', sans-serif", - "description": "%markdown.preview.fontFamily.desc%", + "description": "%asciidoc.preview.fontFamily.desc%", "scope": "resource" }, - "markdown.preview.fontSize": { + "asciidoc.preview.fontSize": { "type": "number", "default": 14, - "description": "%markdown.preview.fontSize.desc%", + "description": "%asciidoc.preview.fontSize.desc%", "scope": "resource" }, - "markdown.preview.lineHeight": { + "asciidoc.preview.lineHeight": { "type": "number", "default": 1.6, - "description": "%markdown.preview.lineHeight.desc%", + "description": "%asciidoc.preview.lineHeight.desc%", "scope": "resource" }, - "markdown.preview.scrollPreviewWithEditor": { + "asciidoc.preview.scrollPreviewWithEditor": { "type": "boolean", "default": true, - "description": "%markdown.preview.scrollPreviewWithEditor.desc%", + "description": "%asciidoc.preview.scrollPreviewWithEditor.desc%", "scope": "resource" }, - "markdown.preview.scrollPreviewWithEditorSelection": { + "asciidoc.preview.scrollPreviewWithEditorSelection": { "type": "boolean", "default": true, - "description": "%markdown.preview.scrollPreviewWithEditorSelection.desc%", - "deprecationMessage": "%markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage%" + "description": "%asciidoc.preview.scrollPreviewWithEditorSelection.desc%", + "deprecationMessage": "%asciidoc.preview.scrollPreviewWithEditorSelection.deprecationMessage%" }, - "markdown.preview.markEditorSelection": { + "asciidoc.preview.markEditorSelection": { "type": "boolean", "default": true, - "description": "%markdown.preview.markEditorSelection.desc%", + "description": "%asciidoc.preview.markEditorSelection.desc%", "scope": "resource" }, - "markdown.preview.scrollEditorWithPreview": { + "asciidoc.preview.scrollEditorWithPreview": { "type": "boolean", "default": true, - "description": "%markdown.preview.scrollEditorWithPreview.desc%", + "description": "%asciidoc.preview.scrollEditorWithPreview.desc%", "scope": "resource" }, - "markdown.preview.doubleClickToSwitchToEditor": { + "asciidoc.preview.doubleClickToSwitchToEditor": { "type": "boolean", "default": true, - "description": "%markdown.preview.doubleClickToSwitchToEditor.desc%", + "description": "%asciidoc.preview.doubleClickToSwitchToEditor.desc%", "scope": "resource" }, - "markdown.preview.openMarkdownLinks": { + "asciidoc.preview.openAsciiDocLinks": { "type": "string", "default": "inPreview", - "description": "%configuration.markdown.preview.openMarkdownLinks.description%", + "description": "%configuration.asciidoc.preview.openAsciiDocLinks.description%", "scope": "resource", "enum": [ "inPreview", "inEditor" ], "enumDescriptions": [ - "%configuration.markdown.preview.openMarkdownLinks.inPreview%", - "%configuration.markdown.preview.openMarkdownLinks.inEditor%" + "%configuration.asciidoc.preview.openAsciiDocLinks.inPreview%", + "%configuration.asciidoc.preview.openAsciiDocLinks.inEditor%" ] }, - "markdown.trace": { + "asciidoc.trace": { "type": "string", "enum": [ "off", "verbose" ], "default": "off", - "description": "%markdown.trace.desc%", + "description": "%asciidoc.trace.desc%", "scope": "window" } } }, "configurationDefaults": { - "[markdown]": { + "[asciidoc]": { "editor.wordWrap": "on", "editor.quickSuggestions": false } @@ -323,11 +323,11 @@ "url": "./schemas/package.schema.json" } ], - "markdown.previewStyles": [ - "./media/markdown.css", + "asciidoc.previewStyles": [ + "./media/asciidoc.css", "./media/highlight.css" ], - "markdown.previewScripts": [ + "asciidoc.previewScripts": [ "./media/index.js" ] }, @@ -350,6 +350,9 @@ "mocha-multi-reporters": "^1.1.7" }, "dependencies": { + "highlight.js": "9.12.0", + "markdown-it": "^8.4.1", + "markdown-it-named-headers": "0.0.4", "asciidoctor.js": "^1.5.6-preview.5", "copy-paste": "^1.2.0", "file-url": "^1.0.1", diff --git a/package.nls.json b/package.nls.json index c11eeda0..c4629bf2 100644 --- a/package.nls.json +++ b/package.nls.json @@ -1,28 +1,28 @@ { "displayName": "AsciiDoc", "description": "Provides rich language support for AsciiDoc.", - "markdown.preview.breaks.desc": "Sets how line-breaks are rendered in the markdown preview. Setting it to 'true' creates a
for every newline.", - "markdown.preview.linkify": "Enable or disable conversion of URL-like text to links in the markdown preview.", - "markdown.preview.doubleClickToSwitchToEditor.desc": "Double click in the markdown preview to switch to the editor.", - "markdown.preview.fontFamily.desc": "Controls the font family used in the markdown preview.", - "markdown.preview.fontSize.desc": "Controls the font size in pixels used in the markdown preview.", - "markdown.preview.lineHeight.desc": "Controls the line height used in the markdown preview. This number is relative to the font size.", - "markdown.preview.markEditorSelection.desc": "Mark the current editor selection in the markdown preview.", - "markdown.preview.scrollEditorWithPreview.desc": "When a markdown preview is scrolled, update the view of the editor.", - "markdown.preview.scrollPreviewWithEditor.desc": "When a markdown editor is scrolled, update the view of the preview.", - "markdown.preview.scrollPreviewWithEditorSelection.desc": "[Deprecated] Scrolls the markdown preview to reveal the currently selected line from the editor.", - "markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "This setting has been replaced by 'markdown.preview.scrollPreviewWithEditor' and no longer has any effect.", - "markdown.preview.title": "Open Preview", - "markdown.previewFrontMatter.dec": "Sets how YAML front matter should be rendered in the markdown preview. 'hide' removes the front matter. Otherwise, the front matter is treated as markdown content.", - "markdown.previewSide.title": "Open Preview to the Side", - "markdown.showLockedPreviewToSide.title": "Open Locked Preview to the Side", - "markdown.showSource.title": "Show Source", - "markdown.styles.dec": "A list of URLs or local paths to CSS style sheets to use from the markdown preview. Relative paths are interpreted relative to the folder open in the explorer. If there is no open folder, they are interpreted relative to the location of the markdown file. All '\\' need to be written as '\\\\'.", - "markdown.showPreviewSecuritySelector.title": "Change Preview Security Settings", - "markdown.trace.desc": "Enable debug logging for the markdown extension.", - "markdown.preview.refresh.title": "Refresh Preview", - "markdown.preview.toggleLock.title": "Toggle Preview Locking", - "configuration.markdown.preview.openMarkdownLinks.description": "How should clicking on links to markdown files be handled in the preview.", - "configuration.markdown.preview.openMarkdownLinks.inEditor": "Try to open links in the editor", - "configuration.markdown.preview.openMarkdownLinks.inPreview": "Try to open links in the the markdown preview" + "asciidoc.preview.breaks.desc": "Sets how line-breaks are rendered in the markdown preview. Setting it to 'true' creates a
for every newline.", + "asciidoc.preview.linkify": "Enable or disable conversion of URL-like text to links in the markdown preview.", + "asciidoc.preview.doubleClickToSwitchToEditor.desc": "Double click in the markdown preview to switch to the editor.", + "asciidoc.preview.fontFamily.desc": "Controls the font family used in the markdown preview.", + "asciidoc.preview.fontSize.desc": "Controls the font size in pixels used in the markdown preview.", + "asciidoc.preview.lineHeight.desc": "Controls the line height used in the markdown preview. This number is relative to the font size.", + "asciidoc.preview.markEditorSelection.desc": "Mark the current editor selection in the markdown preview.", + "asciidoc.preview.scrollEditorWithPreview.desc": "When a markdown preview is scrolled, update the view of the editor.", + "asciidoc.preview.scrollPreviewWithEditor.desc": "When a markdown editor is scrolled, update the view of the preview.", + "asciidoc.preview.scrollPreviewWithEditorSelection.desc": "[Deprecated] Scrolls the markdown preview to reveal the currently selected line from the editor.", + "asciidoc.preview.scrollPreviewWithEditorSelection.deprecationMessage": "This setting has been replaced by 'asciidoc.preview.scrollPreviewWithEditor' and no longer has any effect.", + "asciidoc.preview.title": "Open Preview", + "asciidoc.previewFrontMatter.dec": "Sets how YAML front matter should be rendered in the markdown preview. 'hide' removes the front matter. Otherwise, the front matter is treated as markdown content.", + "asciidoc.previewSide.title": "Open Preview to the Side", + "asciidoc.showLockedPreviewToSide.title": "Open Locked Preview to the Side", + "asciidoc.showSource.title": "Show Source", + "asciidoc.styles.dec": "A list of URLs or local paths to CSS style sheets to use from the markdown preview. Relative paths are interpreted relative to the folder open in the explorer. If there is no open folder, they are interpreted relative to the location of the markdown file. All '\\' need to be written as '\\\\'.", + "asciidoc.showPreviewSecuritySelector.title": "Change Preview Security Settings", + "asciidoc.trace.desc": "Enable debug logging for the markdown extension.", + "asciidoc.preview.refresh.title": "Refresh Preview", + "asciidoc.preview.toggleLock.title": "Toggle Preview Locking", + "configuration.asciidoc.preview.openMarkdownLinks.description": "How should clicking on links to markdown files be handled in the preview.", + "configuration.asciidoc.preview.openMarkdownLinks.inEditor": "Try to open links in the editor", + "configuration.asciidoc.preview.openMarkdownLinks.inPreview": "Try to open links in the the markdown preview" } \ No newline at end of file diff --git a/schemas/package.schema.json b/schemas/package.schema.json index e76ce046..48793f2e 100644 --- a/schemas/package.schema.json +++ b/schemas/package.schema.json @@ -6,7 +6,7 @@ "contributes": { "type": "object", "properties": { - "markdown.previewStyles": { + "asciidoc.previewStyles": { "type": "array", "description": "Contributed CSS files that change the look or layout of the Markdown preview", "items": { @@ -14,7 +14,7 @@ "description": "Extension relative path to a css file" } }, - "markdown.previewScripts": { + "asciidoc.previewScripts": { "type": "array", "description": "Contributed scripts that are executed in the Markdown preview", "items": { @@ -22,7 +22,7 @@ "description": "Extension relative path to a JavaScript file" } }, - "markdown.markdownItPlugins": { + "asciidoc.markdownItPlugins": { "type": "boolean", "description": "Does this extension contribute a markdown-it plugin?" } diff --git a/src/commands/moveCursorToPosition.ts b/src/commands/moveCursorToPosition.ts index bcc9e56f..42110a0c 100644 --- a/src/commands/moveCursorToPosition.ts +++ b/src/commands/moveCursorToPosition.ts @@ -8,7 +8,7 @@ import * as vscode from 'vscode'; import { Command } from '../commandManager'; export class MoveCursorToPositionCommand implements Command { - public readonly id = '_markdown.moveCursorToPosition'; + public readonly id = '_asciidoc.moveCursorToPosition'; public execute(line: number, character: number) { if (!vscode.window.activeTextEditor) { diff --git a/src/commands/openDocumentLink.ts b/src/commands/openDocumentLink.ts index 8e1dd866..94b978af 100644 --- a/src/commands/openDocumentLink.ts +++ b/src/commands/openDocumentLink.ts @@ -18,7 +18,7 @@ export interface OpenDocumentLinkArgs { } export class OpenDocumentLinkCommand implements Command { - private static readonly id = '_markdown.openDocumentLink'; + private static readonly id = '_asciidoc.openDocumentLink'; public readonly id = OpenDocumentLinkCommand.id; public static createCommandUri( diff --git a/src/commands/refreshPreview.ts b/src/commands/refreshPreview.ts index fb1bb829..3f20e72a 100644 --- a/src/commands/refreshPreview.ts +++ b/src/commands/refreshPreview.ts @@ -7,7 +7,7 @@ import { Command } from '../commandManager'; import { MarkdownPreviewManager } from '../features/previewManager'; export class RefreshPreviewCommand implements Command { - public readonly id = 'markdown.preview.refresh'; + public readonly id = 'asciidoc.preview.refresh'; public constructor( private readonly webviewManager: MarkdownPreviewManager diff --git a/src/commands/showPreview.ts b/src/commands/showPreview.ts index 9c30c321..d037428d 100644 --- a/src/commands/showPreview.ts +++ b/src/commands/showPreview.ts @@ -19,7 +19,7 @@ async function showPreview( uri: vscode.Uri | undefined, previewSettings: ShowPreviewSettings, ): Promise { - let resource = uri; + let resource = uri; if (!(resource instanceof vscode.Uri)) { if (vscode.window.activeTextEditor) { // we are relaxed and don't check for markdown files @@ -30,7 +30,7 @@ async function showPreview( if (!(resource instanceof vscode.Uri)) { if (!vscode.window.activeTextEditor) { // this is most likely toggling the preview - return vscode.commands.executeCommand('markdown.showSource'); + return vscode.commands.executeCommand('asciidoc.showSource'); } // nothing found that could be shown or toggled return; @@ -46,7 +46,7 @@ async function showPreview( } export class ShowPreviewCommand implements Command { - public readonly id = 'markdown.showPreview'; + public readonly id = 'asciidoc.showPreview'; public constructor( private readonly webviewManager: MarkdownPreviewManager, @@ -63,7 +63,7 @@ export class ShowPreviewCommand implements Command { } export class ShowPreviewToSideCommand implements Command { - public readonly id = 'markdown.showPreviewToSide'; + public readonly id = 'asciidoc.showPreviewToSide'; public constructor( private readonly webviewManager: MarkdownPreviewManager, @@ -79,7 +79,7 @@ export class ShowPreviewToSideCommand implements Command { export class ShowLockedPreviewToSideCommand implements Command { - public readonly id = 'markdown.showLockedPreviewToSide'; + public readonly id = 'asciidoc.showLockedPreviewToSide'; public constructor( private readonly webviewManager: MarkdownPreviewManager, diff --git a/src/commands/showPreviewSecuritySelector.ts b/src/commands/showPreviewSecuritySelector.ts index 2e520415..35e0d6eb 100644 --- a/src/commands/showPreviewSecuritySelector.ts +++ b/src/commands/showPreviewSecuritySelector.ts @@ -10,7 +10,7 @@ import { isMarkdownFile } from '../util/file'; import { MarkdownPreviewManager } from '../features/previewManager'; export class ShowPreviewSecuritySelectorCommand implements Command { - public readonly id = 'markdown.showPreviewSecuritySelector'; + public readonly id = 'asciidoc.showPreviewSecuritySelector'; public constructor( private readonly previewSecuritySelector: PreviewSecuritySelector, diff --git a/src/commands/showSource.ts b/src/commands/showSource.ts index a916bcce..c958449c 100644 --- a/src/commands/showSource.ts +++ b/src/commands/showSource.ts @@ -8,7 +8,7 @@ import { Command } from '../commandManager'; import { MarkdownPreviewManager } from '../features/previewManager'; export class ShowSourceCommand implements Command { - public readonly id = 'markdown.showSource'; + public readonly id = 'asciidoc.showSource'; public constructor( private readonly previewManager: MarkdownPreviewManager diff --git a/src/commands/toggleLock.ts b/src/commands/toggleLock.ts index a6596e5e..c7d36677 100644 --- a/src/commands/toggleLock.ts +++ b/src/commands/toggleLock.ts @@ -7,7 +7,7 @@ import { Command } from '../commandManager'; import { MarkdownPreviewManager } from '../features/previewManager'; export class ToggleLockCommand implements Command { - public readonly id = 'markdown.preview.toggleLock'; + public readonly id = 'asciidoc.preview.toggleLock'; public constructor( private readonly previewManager: MarkdownPreviewManager diff --git a/src/features/documentLinkProvider.ts b/src/features/documentLinkProvider.ts index c714e388..6b12a1d5 100644 --- a/src/features/documentLinkProvider.ts +++ b/src/features/documentLinkProvider.ts @@ -121,7 +121,7 @@ export default class LinkProvider implements vscode.DocumentLinkProvider { if (link) { results.push(new vscode.DocumentLink( new vscode.Range(linkStart, linkEnd), - vscode.Uri.parse(`command:_markdown.moveCursorToPosition?${encodeURIComponent(JSON.stringify([link.linkRange.start.line, link.linkRange.start.character]))}`))); + vscode.Uri.parse(`command:_asciidoc.moveCursorToPosition?${encodeURIComponent(JSON.stringify([link.linkRange.start.line, link.linkRange.start.character]))}`))); } } catch (e) { // noop diff --git a/src/features/preview.ts b/src/features/preview.ts index 2ae362cf..5ec59393 100644 --- a/src/features/preview.ts +++ b/src/features/preview.ts @@ -20,7 +20,7 @@ const localize = nls.loadMessageBundle(); export class MarkdownPreview { - public static viewType = 'markdown.preview'; + public static viewType = 'asciidoc.preview'; private _resource: vscode.Uri; private _locked: boolean; @@ -142,11 +142,11 @@ export class MarkdownPreview { break; case 'showPreviewSecuritySelector': - vscode.commands.executeCommand('markdown.showPreviewSecuritySelector', e.body.source); + vscode.commands.executeCommand('asciidoc.showPreviewSecuritySelector', e.body.source); break; case 'previewStyleLoadError': - vscode.window.showWarningMessage(localize('onPreviewStyleLoadError', "Could not load 'markdown.styles': {0}", e.body.unloadedStyles.join(', '))); + vscode.window.showWarningMessage(localize('onPreviewStyleLoadError', "Could not load 'asciidoc.styles': {0}", e.body.unloadedStyles.join(', '))); break; } }, null, this.disposables); @@ -426,7 +426,7 @@ export class MarkdownPreview { } } - vscode.commands.executeCommand('_markdown.openDocumentLink', { path, fragment }); + vscode.commands.executeCommand('_asciidoc.openDocumentLink', { path, fragment }); } private async onCacheImageSizes(imageInfo: { id: string, width: number, height: number }[]) { diff --git a/src/logger.ts b/src/logger.ts index 4ee89cbb..7d605245 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -33,7 +33,7 @@ function isString(value: any): value is string { export class Logger { private trace?: Trace; - private readonly outputChannel = lazy(() => vscode.window.createOutputChannel('Markdown')); + private readonly outputChannel = lazy(() => vscode.window.createOutputChannel('Asciidoc')); constructor() { this.updateConfiguration(); @@ -57,7 +57,7 @@ export class Logger { } private readTrace(): Trace { - return Trace.fromString(vscode.workspace.getConfiguration().get('markdown.trace', 'off')); + return Trace.fromString(vscode.workspace.getConfiguration().get('asciidoc.trace', 'off')); } private static data2String(data: any): string { diff --git a/src/markdownEngine.ts b/src/markdownEngine.ts index 26028af3..cda9c4b5 100644 --- a/src/markdownEngine.ts +++ b/src/markdownEngine.ts @@ -35,7 +35,9 @@ export class MarkdownEngine { private async getEngine(resource: vscode.Uri): Promise { if (!this.md) { - const hljs = await import('highlight.js'); + console.log("Setting up engine"); + const hljs = await import('highlight.js'); + console.log("Done"); const mdnh = await import('markdown-it-named-headers'); this.md = (await import('markdown-it'))({ html: true, diff --git a/src/markdownExtensions.ts b/src/markdownExtensions.ts index 55c8d76e..6d6065da 100644 --- a/src/markdownExtensions.ts +++ b/src/markdownExtensions.ts @@ -81,7 +81,7 @@ class MarkdownExtensionContributions implements MarkdownContributions { this.tryLoadPreviewScripts(contributes, extension); this.tryLoadMarkdownItPlugins(contributes, extension); - if (contributes['markdown.previewScripts'] || contributes['markdown.previewStyles']) { + if (contributes['asciidoc.previewScripts'] || contributes['asciidoc.previewStyles']) { this._previewResourceRoots.push(vscode.Uri.file(extension.extensionPath)); } } @@ -91,7 +91,7 @@ class MarkdownExtensionContributions implements MarkdownContributions { contributes: any, extension: vscode.Extension ) { - if (contributes['markdown.markdownItPlugins']) { + if (contributes['asciidoc.markdownItPlugins']) { this._plugins.push(extension.activate().then(() => { if (extension.exports && extension.exports.extendMarkdownIt) { return (md: any) => extension.exports.extendMarkdownIt(md); @@ -105,14 +105,14 @@ class MarkdownExtensionContributions implements MarkdownContributions { contributes: any, extension: vscode.Extension ) { - this._scripts.push(...resolveExtensionResources(extension, contributes['markdown.previewScripts'])); + this._scripts.push(...resolveExtensionResources(extension, contributes['asciidoc.previewScripts'])); } private tryLoadPreviewStyles( contributes: any, extension: vscode.Extension ) { - this._styles.push(...resolveExtensionResources(extension, contributes['markdown.previewStyles'])); + this._styles.push(...resolveExtensionResources(extension, contributes['asciidoc.previewStyles'])); } } diff --git a/src/test/documentLinkProvider.test.ts b/src/test/documentLinkProvider.test.ts index 5a1d0c87..301fba45 100644 --- a/src/test/documentLinkProvider.test.ts +++ b/src/test/documentLinkProvider.test.ts @@ -32,7 +32,7 @@ function assertRangeEqual(expected: vscode.Range, actual: vscode.Range) { assert.strictEqual(expected.end.character, actual.end.character); } -suite('markdown.DocumentLinkProvider', () => { +suite('asciidoc.DocumentLinkProvider', () => { test('Should not return anything for empty document', () => { const links = getLinksForFile(''); assert.strictEqual(links.length, 0); diff --git a/src/test/documentSymbolProvider.test.ts b/src/test/documentSymbolProvider.test.ts index 9533f807..efe7c0ef 100644 --- a/src/test/documentSymbolProvider.test.ts +++ b/src/test/documentSymbolProvider.test.ts @@ -21,7 +21,7 @@ function getSymbolsForFile(fileContents: string) { } -suite('markdown.DocumentSymbolProvider', () => { +suite('asciidoc.DocumentSymbolProvider', () => { test('Should not return anything for empty document', async () => { const symbols = await getSymbolsForFile(''); assert.strictEqual(symbols.length, 0); diff --git a/src/test/foldingProvider.test.ts b/src/test/foldingProvider.test.ts index 2ad8444d..7dce40c0 100644 --- a/src/test/foldingProvider.test.ts +++ b/src/test/foldingProvider.test.ts @@ -13,7 +13,7 @@ import { createNewMarkdownEngine } from './engine'; const testFileName = vscode.Uri.file('test.md'); -suite('markdown.FoldingProvider', () => { +suite('asciidoc.FoldingProvider', () => { test('Should not return anything for empty document', async () => { const folds = await getFoldsForDocument(``); assert.strictEqual(folds.length, 0); diff --git a/src/test/tableOfContentsProvider.test.ts b/src/test/tableOfContentsProvider.test.ts index ee103b29..294c536f 100644 --- a/src/test/tableOfContentsProvider.test.ts +++ b/src/test/tableOfContentsProvider.test.ts @@ -13,7 +13,7 @@ import { createNewMarkdownEngine } from './engine'; const testFileName = vscode.Uri.file('test.md'); -suite('markdown.TableOfContentsProvider', () => { +suite('asciidoc.TableOfContentsProvider', () => { test('Lookup should not return anything for empty document', async () => { const doc = new InMemoryDocument(testFileName, ''); const provider = new TableOfContentsProvider(createNewMarkdownEngine(), doc); diff --git a/src/test/workspaceSymbolProvider.test.ts b/src/test/workspaceSymbolProvider.test.ts index f5b3eb0e..d8a67b0d 100644 --- a/src/test/workspaceSymbolProvider.test.ts +++ b/src/test/workspaceSymbolProvider.test.ts @@ -14,7 +14,7 @@ import { InMemoryDocument } from './inMemoryDocument'; const symbolProvider = new MDDocumentSymbolProvider(createNewMarkdownEngine()); -suite('markdown.WorkspaceSymbolProvider', () => { +suite('asciidoc.WorkspaceSymbolProvider', () => { test('Should not return anything for empty workspace', async () => { const provider = new MarkdownWorkspaceSymbolProvider(symbolProvider, new InMemoryWorkspaceMarkdownDocumentProvider([])); diff --git a/test/samples/simple.adoc b/test/samples/simple.adoc index da7d7de2..59b6f5ed 100644 --- a/test/samples/simple.adoc +++ b/test/samples/simple.adoc @@ -8,7 +8,7 @@ Preview as you type, including formatting like *this*, or _this_. It will automatically refresh, just as you type == Heading level 2 -Diferrente heading levels are easly procuded with the # symbol . +Different heading levels are easily found with the # symbol . You can also do _italic_ or *bold* like in the more common mark down. AsciiDoc supports tables and much more.