Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Top voted solution webview#193

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
jdneo merged 15 commits intoLeetCode-OpenSource:masterfromVigilans:solution-view
Mar 13, 2019
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
15 commits
Select commitHold shift + click to select a range
8d5d6d6
Merge pull request #1 from jdneo/master
VigilansMar 5, 2019
f23bfa2
Add `soluton` command and solution webview provider
VigilansMar 7, 2019
2a83af2
Add Solution class & solution raw string parsing
VigilansMar 7, 2019
221ff29
Add markdown-it parser with syntax highlight
VigilansMar 7, 2019
9c01549
Add markdown style support for SolutionProvider
VigilansMar 8, 2019
6478ebc
Render cold_block with solution language in SolutionProvider
VigilansMar 8, 2019
16bf8d6
Format modification:
VigilansMar 8, 2019
eaba061
Enrich content in webview
VigilansMar 8, 2019
5015c2b
Merge branch 'master' into solution-view
VigilansMar 11, 2019
7f39d60
Minor fixes
VigilansMar 11, 2019
3ca637c
Minor fixes
VigilansMar 12, 2019
4dd2ed2
Merge branch 'master' into solution-view
VigilansMar 12, 2019
a97f899
Merge branch 'master' into solution-view
VigilansMar 13, 2019
c033f24
Minor fixes according to review
VigilansMar 13, 2019
3f7a90d
Merge branch 'master' into solution-view
jdneoMar 13, 2019
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
60 changes: 57 additions & 3 deletionspackage-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

24 changes: 22 additions & 2 deletionspackage.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,11 @@
"dark": "resources/dark/search.svg"
}
},
{
"command": "leetcode.showSolution",
"title": "Show Top Voted Solution",
"category": "LeetCode"
},
{
"command": "leetcode.testSolution",
"title": "Test in LeetCode",
Expand DownExpand Up@@ -171,6 +176,12 @@
"when": "view == leetCodeExplorer && viewItem == problem",
"group": "leetcode@1"
},
{

"command": "leetcode.showSolution",
"when": "view == leetCodeExplorer && viewItem == problem",
"group": "leetcode@1"
},
{
"command": "leetcode.previewProblem",
"when": "view == leetCodeExplorer && viewItem == problem",
Expand All@@ -182,6 +193,11 @@
"command": "leetcode.showProblem",
"when": "never"
},
{

"command": "leetcode.showSolution",
"when": "never"
},
{
"command": "leetcode.previewProblem",
"when": "never"
Expand DownExpand Up@@ -288,7 +304,9 @@
},
"devDependencies": {
"@types/fs-extra": "5.0.0",
"@types/highlight.js": "^9.12.3",
"@types/lodash.kebabcase": "^4.1.5",
"@types/markdown-it": "0.0.7",
"@types/mocha": "^2.2.42",
"@types/node": "^7.0.43",
"@types/require-from-string": "^1.2.0",
Expand All@@ -298,8 +316,10 @@
},
"dependencies": {
"fs-extra": "^6.0.1",
"vsc-leetcode-cli": "2.6.2",
"highlight.js": "^9.15.6",
"lodash.kebabcase": "^4.1.1",
"require-from-string": "^2.0.2"
"markdown-it": "^8.4.2",
"require-from-string": "^2.0.2",
"vsc-leetcode-cli": "2.6.2"
}
}
69 changes: 49 additions & 20 deletionssrc/commands/show.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { LeetCodeNode } from "../explorer/LeetCodeNode";
import { leetCodeChannel } from "../leetCodeChannel";
import { leetCodeExecutor } from "../leetCodeExecutor";
import { leetCodeManager } from "../leetCodeManager";
import { leetCodeSolutionProvider } from "../leetCodeSolutionProvider";
import { IProblem, IQuickItemEx, languages, ProblemState } from "../shared";
import { DialogOptions, DialogType, promptForOpenOutputChannel, promptForSignIn } from "../utils/uiUtils";
import { selectWorkspaceFolder } from "../utils/workspaceUtils";
Expand DownExpand Up@@ -39,18 +40,60 @@ export async function searchProblem(): Promise<void> {
await showProblemInternal(choice.value);
}

async function showProblemInternal(node: IProblem): Promise<void> {
export async function showSolution(node?: LeetCodeNode): Promise<void> {
if (!node) {
return;
}
const language: string | undefined = await fetchProblemLanguage();
if (!language) {
return;
}
try {
const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
let defaultLanguage: string | undefined = leetCodeConfig.get<string>("defaultLanguage");
if (defaultLanguage && languages.indexOf(defaultLanguage) < 0) {
defaultLanguage = undefined;
let solution: string = await leetCodeExecutor.showSolution(node, language);
// remove backslash in espaced \'...\'(generated by leetcode's database)
solution = solution.replace(/\\'/g, "'");
await leetCodeSolutionProvider.show(solution, node);
} catch (error) {
await promptForOpenOutputChannel("Failed to fetch the top voted solution. Please open the output channel for details.", DialogType.error);
}
}

// SUGGESTION: group config retriving into one file
async function fetchProblemLanguage(): Promise<string | undefined> {
const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
let defaultLanguage: string | undefined = leetCodeConfig.get<string>("defaultLanguage");
if (defaultLanguage && languages.indexOf(defaultLanguage) < 0) {
defaultLanguage = undefined;
}
const language: string | undefined = defaultLanguage || await vscode.window.showQuickPick(languages, { placeHolder: "Select the language you want to use" });
// fire-and-forget default language query
(async (): Promise<void> => {
if (!defaultLanguage && leetCodeConfig.get<boolean>("showSetDefaultLanguageHint")) {
const choice: vscode.MessageItem | undefined = await vscode.window.showInformationMessage(
`Would you like to set '${language}' as your default language?`,
DialogOptions.yes,
DialogOptions.no,
DialogOptions.never,
);
if (choice === DialogOptions.yes) {
leetCodeConfig.update("defaultLanguage", language, true /* UserSetting */);
} else if (choice === DialogOptions.never) {
leetCodeConfig.update("showSetDefaultLanguageHint", false, true /* UserSetting */);
}
}
const language: string | undefined = defaultLanguage || await vscode.window.showQuickPick(languages, { placeHolder: "Select the language you want to use" });
})();
return language;
}

async function showProblemInternal(node: IProblem): Promise<void> {
try {
const language: string | undefined = await fetchProblemLanguage();
if (!language) {
return;
}

// SUGGESTION: group config retriving into one file
const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
let outDir: string = await selectWorkspaceFolder();
let relativePath: string = (leetCodeConfig.get<string>("outputFolder") || "").trim();
const matchResult: RegExpMatchArray | null = relativePath.match(/\$\{(.*?)\}/);
Expand All@@ -69,20 +112,6 @@ async function showProblemInternal(node: IProblem): Promise<void> {
const originFilePath: string = await leetCodeExecutor.showProblem(node, language, outDir);
const filePath: string = wsl.useWsl() ? await wsl.toWinPath(originFilePath) : originFilePath;
await vscode.window.showTextDocument(vscode.Uri.file(filePath), { preview: false });

if (!defaultLanguage && leetCodeConfig.get<boolean>("showSetDefaultLanguageHint")) {
const choice: vscode.MessageItem | undefined = await vscode.window.showInformationMessage(
`Would you like to set '${language}' as your default language?`,
DialogOptions.yes,
DialogOptions.no,
DialogOptions.never,
);
if (choice === DialogOptions.yes) {
leetCodeConfig.update("defaultLanguage", language, true /* UserSetting */);
} else if (choice === DialogOptions.never) {
leetCodeConfig.update("showSetDefaultLanguageHint", false, true /* UserSetting */);
}
}
} catch (error) {
await promptForOpenOutputChannel("Failed to show the problem. Please open the output channel for details.", DialogType.error);
}
Expand Down
4 changes: 4 additions & 0 deletionssrc/extension.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import { leetCodeExecutor } from "./leetCodeExecutor";
import { leetCodeManager } from "./leetCodeManager";
import { leetCodePreviewProvider } from "./leetCodePreviewProvider";
import { leetCodeResultProvider } from "./leetCodeResultProvider";
import { leetCodeSolutionProvider } from "./leetCodeSolutionProvider";
import { leetCodeStatusBarItem } from "./leetCodeStatusBarItem";

export async function activate(context: vscode.ExtensionContext): Promise<void> {
Expand All@@ -32,12 +33,14 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
const leetCodeTreeDataProvider: LeetCodeTreeDataProvider = new LeetCodeTreeDataProvider(context);
leetCodePreviewProvider.initialize(context);
leetCodeResultProvider.initialize(context);
leetCodeSolutionProvider.initialize(context);

context.subscriptions.push(
leetCodeStatusBarItem,
leetCodeChannel,
leetCodePreviewProvider,
leetCodeResultProvider,
leetCodeSolutionProvider,
vscode.window.createTreeView("leetCodeExplorer", { treeDataProvider: leetCodeTreeDataProvider, showCollapseAll: true }),
vscode.languages.registerCodeLensProvider({ scheme: "file" }, codeLensProvider),
vscode.commands.registerCommand("leetcode.deleteCache", () => cache.deleteCache()),
Expand All@@ -49,6 +52,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
vscode.commands.registerCommand("leetcode.previewProblem", (node: LeetCodeNode) => leetCodePreviewProvider.preview(node)),
vscode.commands.registerCommand("leetcode.showProblem", (node: LeetCodeNode) => show.showProblem(node)),
vscode.commands.registerCommand("leetcode.searchProblem", () => show.searchProblem()),
vscode.commands.registerCommand("leetcode.showSolution", (node: LeetCodeNode) => show.showSolution(node)),
vscode.commands.registerCommand("leetcode.refreshExplorer", () => leetCodeTreeDataProvider.refresh()),
vscode.commands.registerCommand("leetcode.testSolution", (uri?: vscode.Uri) => test.testSolution(uri)),
vscode.commands.registerCommand("leetcode.submitSolution", (uri?: vscode.Uri) => submit.submitSolution(uri)),
Expand Down
15 changes: 11 additions & 4 deletionssrc/leetCodeExecutor.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,10 +48,12 @@ class LeetCodeExecutor {
}
return false;
}
try { // Check company plugin
await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-e", "company"]);
} catch (error) { // Download company plugin and activate
await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-i", "company"]);
for (const plugin of ["company", "solution.discuss"]) {
try { // Check plugin
await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-e", plugin]);
} catch (error) { // Download plugin and activate
await this.executeCommandEx("node", [await this.getLeetCodeBinaryPath(), "plugin", "-i", plugin]);
}
}
return true;
}
Expand DownExpand Up@@ -87,6 +89,11 @@ class LeetCodeExecutor {
return filePath;
}

public async showSolution(problemNode: IProblem, language: string): Promise<string> {
const solution: string = await this.executeCommandWithProgressEx("Fetching top voted solution from discussions...", "node", [await this.getLeetCodeBinaryPath(), "show", problemNode.id, "--solution", "-l", language]);
return solution;
}

public async getDescription(problemNode: IProblem): Promise<string> {
return await this.executeCommandWithProgressEx("Fetching problem description...", "node", [await this.getLeetCodeBinaryPath(), "show", problemNode.id, "-x"]);
}
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp