diff --git a/src/webview_controller.js b/src/webview_controller.js index 57bf4c65af823be06b7afcabfc87e66fe6fb023e..3e5fa49a654b45f35e3424fc663282dde75dadd6 100644 --- a/src/webview_controller.js +++ b/src/webview_controller.js @@ -5,6 +5,7 @@ const vscode = require('vscode'); const gitLabService = require('./gitlab_service'); const { createGitLabNewService } = require('./service_factory'); const { logError } = require('./log'); +const { getInstanceUrl } = require('./utils/get_instance_url'); let context = null; @@ -59,6 +60,7 @@ const createPanel = issuable => { }; const createMessageHandler = (panel, issuable, workspaceFolder) => async message => { + const instanceUrl = await getInstanceUrl(workspaceFolder); if (message.command === 'renderMarkdown') { const alteredMarkdown = message.markdown.replace( /\(\/.*(\/-)?\/merge_requests\//, @@ -68,7 +70,7 @@ const createMessageHandler = (panel, issuable, workspaceFolder) => async message rendered = (rendered || '') .replace(/ src=".*" alt/gim, ' alt') .replace(/" data-src/gim, '" src') - .replace(/ href="\//gim, ` href="${vscode.workspace.getConfiguration('gitlab').instanceUrl}/`) + .replace(/ href="\//gim, ` href="${instanceUrl}/`) .replace(/\/master\/-\/merge_requests\//gim, '/-/merge_requests/'); panel.webview.postMessage({