diff --git a/src/extension.ts b/src/extension.ts index 43997360..4cff447f 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -2,6 +2,8 @@ import * as vscode from 'vscode'; import { Octokit } from "@octokit/core"; import { GitExtension } from '../git'; import { Credentials } from './credentials'; +import getWebviewOptions from './utils/getWebViewOptions'; +import getNonce from './utils/getNonce'; //@ts-ignore //console.log(git?.getRepository(vscode.Uri.file(vscode.workspace?.workspaceFolders[0].uri.path))) @@ -54,16 +56,6 @@ export async function activate(context: vscode.ExtensionContext) { } -function getWebviewOptions(extensionUri: vscode.Uri): vscode.WebviewOptions { - return { - // Enable javascript in the webview - enableScripts: true, - - // And restrict the webview to only loading content from our extension's `media` directory. - localResourceRoots: [vscode.Uri.joinPath(extensionUri, 'media')] - }; -} - /** * Manages cat coding webview panels */ @@ -262,27 +254,10 @@ class watermelonPanel { } } -function getNonce() { - let text = ''; - const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - for (let i = 0; i < 32; i++) { - text += possible.charAt(Math.floor(Math.random() * possible.length)); - } - return text; -} - const gitExtension = vscode.extensions.getExtension('vscode.git') -let git -console.log("gitEXTPRE", gitExtension?.isActive) -gitExtension?.activate() -console.log("gitEXT", gitExtension?.isActive) +let git; +gitExtension?.activate(); if (gitExtension?.isActive) { - git = gitExtension?.exports?.getAPI(1) - console.log("ACTIVEgit", git) + git = gitExtension?.exports?.getAPI(1); }; -while (!gitExtension?.isActive) { - console.log("gitEXT", gitExtension?.isActive) - -} -console.log("git", git) \ No newline at end of file diff --git a/src/utils/getNonce.ts b/src/utils/getNonce.ts new file mode 100644 index 00000000..43d5ef9b --- /dev/null +++ b/src/utils/getNonce.ts @@ -0,0 +1,8 @@ +export default function getNonce() { + let text = ''; + const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + for (let i = 0; i < 32; i++) { + text += possible.charAt(Math.floor(Math.random() * possible.length)); + } + return text; +} \ No newline at end of file diff --git a/src/utils/getWebViewOptions.ts b/src/utils/getWebViewOptions.ts new file mode 100644 index 00000000..6603fc22 --- /dev/null +++ b/src/utils/getWebViewOptions.ts @@ -0,0 +1,11 @@ +import * as vscode from 'vscode'; + +export default function getWebviewOptions(extensionUri: vscode.Uri): vscode.WebviewOptions { + return { + // Enable javascript in the webview + enableScripts: true, + + // And restrict the webview to only loading content from our extension's `media` directory. + localResourceRoots: [vscode.Uri.joinPath(extensionUri, 'media')] + }; +} \ No newline at end of file