diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 6253f0a4..c697e09a 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -3,11 +3,11 @@ name: 💬 Questions / Help
about: If you have questions, please check our documents first
---
-Before you submit an question we recommend you to check out the [DOCUMENT](https://github.com/jdneo/vscode-leetcode/blob/master/README.md) first.
+Before you submit an question we recommend you to check out the [DOCUMENT](https://github.com/LeetCode-OpenSource/vscode-leetcode/blob/master/README.md) first.
You can also find more information in:
-- [TROUBLESHOOTING](https://github.com/jdneo/vscode-leetcode/wiki/Troubleshooting)
-- [FAQ](https://github.com/jdneo/vscode-leetcode/wiki/FAQ)
+- [TROUBLESHOOTING](https://github.com/LeetCode-OpenSource/vscode-leetcode/wiki/Troubleshooting)
+- [FAQ](https://github.com/LeetCode-OpenSource/vscode-leetcode/wiki/FAQ)
## 💬 Questions and Help
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..dd9a1c24
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,50 @@
+name: CI
+
+on:
+ push:
+ branches: [master]
+ pull_request:
+ branches: [master]
+
+jobs:
+ linux:
+ name: Linux
+ runs-on: ubuntu-latest
+ timeout-minutes: 30
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Setup Node.js environment
+ uses: actions/setup-node@v2
+ with:
+ node-version: 14
+
+ - name: Install Node.js modules
+ run: npm install
+
+ - name: Lint
+ run: npm run lint
+
+ - name: VSCE Packge
+ run: npx vsce package
+
+ windows:
+ name: Windows
+ runs-on: windows-latest
+ timeout-minutes: 30
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Setup Node.js environment
+ uses: actions/setup-node@v2
+ with:
+ node-version: 14
+
+ - name: Install Node.js modules
+ run: npm install
+
+ - name: Lint
+ run: npm run lint
+
+ - name: VSCE Packge
+ run: npx vsce package
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 6bbae841..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-language: node_js
-
-node_js:
- - 'lts/*'
-
-before_install:
- - if [ $TRAVIS_OS_NAME == "linux" ]; then
- export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
- sh -e /etc/init.d/xvfb start;
- sleep 3;
- fi
-
-install:
- - npm install -g vsce
- - npm install
-
-script:
- - npm run lint
- - vsce package
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a2d0a8b1..5e5ca483 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,5 @@
{
- "editor.formatOnSave": true,
+ "editor.formatOnSave": false,
"editor.insertSpaces": true,
"editor.tabSize": 4,
"files.insertFinalNewline": true,
@@ -10,5 +10,8 @@
".vscode-test": true
},
"tslint.autoFixOnSave": true,
- "tslint.ignoreDefinitionFiles": true
-}
\ No newline at end of file
+ "tslint.ignoreDefinitionFiles": true,
+ "prettier.tabWidth": 4,
+ "prettier.useTabs": false,
+ "prettier.printWidth": 150
+}
diff --git a/.vscodeignore b/.vscodeignore
index 8cdceec0..7a04907d 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -5,7 +5,6 @@ test/**
src/**
**/*.map
.gitignore
-.travis.yml
package-lock.json
tsconfig.json
tslint.json
diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md
index bddc5bd5..6c7758be 100644
--- a/ACKNOWLEDGEMENTS.md
+++ b/ACKNOWLEDGEMENTS.md
@@ -2,16 +2,23 @@
A big thanks to the following individuals for contributing:
-- [@TsFreddie](https://github.com/TsFreddie) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=TsFreddie)
-- [@ntt2k](https://github.com/ntt2k) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=ntt2k)
-- [@purocean](https://github.com/purocean) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=purocean)
-- [@Xeonacid](https://github.com/Xeonacid) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=Xeonacid)
-- [@Himself65](https://github.com/Himself65) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=Himself65)
-- [@Vigilans](https://github.com/Vigilans) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=Vigilans)
-- [@ringcrl](https://github.com/ringcrl) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=ringcrl)
-- [@pujiaxun](https://github.com/pujiaxun) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=pujiaxun)
-- [@edvardchen](https://github.com/edvardchen) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=edvardchen)
-- [@poppinlp](https://github.com/poppinlp) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=poppinlp)
-- [@xuzaixian](https://github.com/xuzaixian) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=xuzaixian)
-- [@ZainChen](https://github.com/ZainChen) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=ZainChen)
-- [@houtianze](https://github.com/houtianze) — [contributions](https://github.com/jdneo/vscode-leetcode/commits?author=houtianze)
+- [@JIEJIAN21](https://github.com/JIEJIAN21) - thanks for logo and icon design
+- [@TsFreddie](https://github.com/TsFreddie) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=TsFreddie)
+- [@ntt2k](https://github.com/ntt2k) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=ntt2k)
+- [@purocean](https://github.com/purocean) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=purocean)
+- [@Xeonacid](https://github.com/Xeonacid) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=Xeonacid)
+- [@Himself65](https://github.com/Himself65) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=Himself65)
+- [@Vigilans](https://github.com/Vigilans) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=Vigilans)
+- [@ringcrl](https://github.com/ringcrl) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=ringcrl)
+- [@pujiaxun](https://github.com/pujiaxun) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=pujiaxun)
+- [@edvardchen](https://github.com/edvardchen) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=edvardchen)
+- [@poppinlp](https://github.com/poppinlp) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=poppinlp)
+- [@xuzaixian](https://github.com/xuzaixian) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=xuzaixian)
+- [@ZainChen](https://github.com/ZainChen) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=ZainChen)
+- [@houtianze](https://github.com/houtianze) — [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=houtianze)
+- [@magic-akari](https://github.com/magic-akari) - [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=magic-akari)
+- [@SF-Zhou](https://github.com/SF-Zhou) - [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=SF-Zhou)
+- [@fuafa](https://github.com/fuafa) - [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=fuafa)
+- [@iFun](https://github.com/iFun) - [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=iFun)
+- [@hologerry](https://github.com/hologerry) - [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=hologerry)
+- [@yihong0618](https://github.com/yihong0618) - [contributions](https://github.com/LeetCode-OpenSource/vscode-leetcode/commits?author=yihong0618)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dd16029..b9d7d46e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,56 +3,154 @@ All notable changes to the "leetcode" extension will be documented in this file.
Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
+## [0.18.4]
+### Added
+- change graphql path
+
+## [0.18.3]
+### Added
+- re-add cookie-based login method [PR#969](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/969)
+
+## [0.18.2]
+### Fixed
+- fix login issue on VS Code Insiders [PR#968](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/968)
+
+## [0.18.1]
+### Changed
+- change login way and add tracking logic option [PR#944](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/944)
+
+## [0.18.0]
+### Added
+- Add `star` command in shortcuts [PR#601](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/601)
+- Add an option to disable endpoint translation [#389](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/389)
+
+### Changed
+- LeetCode actions are moved into sub-menu: `LeetCode` in the editor context menu. [PR#712](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/712)
+
+### Fixed
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.18.0+is%3Aclosed+label%3Abug)
+
+## [0.17.0]
+### Added
+- Add TypeScript support [#560](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/560)
+
+### Changed
+- Update the UI resources [PR#561](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/561)
+
+## [0.16.2]
+### Added
+- New Category: `Concurrency` [CLI#42](https://github.com/leetcode-tools/leetcode-cli/pull/42)
+- New configuration to better configure how to show the description [#310](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/310)
+
+### Removed
+- Removed the deprecated setting `leetcode.enableShortcuts` [PR#520](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/520)
+- Removed the deprecated setting `leetcode.outputFolder` [PR#521](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/521)
+
+## [0.16.1]
+### Added
+- Can show the problem in current workspace even if it's not a LeetCode workspace [#373](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/373)
+
+### Fixed
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.16.1+is%3Aclosed+label%3Abug)
+
+## [0.16.0]
+### Added
+- Support GitHub login and LinkedIn login [PR#496](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/496)
+
+## [0.15.8]
+### Added
+- Add a new command `Sign In by Cookie` to workaround the issue that [users cannot login to LeetCode](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/478). Please check the [workaround steps](https://github.com/LeetCode-OpenSource/vscode-leetcode/tree/master#%EF%B8%8F-attention-%EF%B8%8F--workaround-to-login-to-leetcode-endpoint) for more details!
+
+### Changed
+- Update the explorer icons to be align with the VS Code design [#460](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/460)
+
+## [0.15.7]
+### Fixed
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.15.7+is%3Aclosed+label%3Abug)
+
+## [0.15.6]
+### Added
+- Add a link to the solution page [#424](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/424)
+
+### Fixed
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.15.6+is%3Aclosed+label%3Abug)
+
+## [0.15.5]
+### Added
+- Add a link to the discussion page [#420](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/420)
+
+### Fixed
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.15.5+is%3Aclosed+label%3Abug)
+
+## [0.15.4]
+### Added
+- Add a new setting `leetcode.filePath`. Now users can use this setting to dynamicly specify the relative folder name and file name. [#PR380](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/380)
+
+### Fixed
+- Missing language `Rust` in the supported language list. [#PR412](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/412)
+- Cannot show output when the answer is wrong. [#414](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/414)
+
+## [0.15.3]
+### Added
+- Support `Pick One` [#263](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/263)
+- Support toggling the favorite problems [#378](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/378)
+
+### Changed
+- Update the activity bar icon [#395](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/263)
+
+### Fixed
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.15.3+is%3Aclosed+label%3Abug)
+
## [0.15.2]
### Added
-- Prompt to open the workspace for LeetCode [#130](https://github.com/jdneo/vscode-leetcode/issues/130)
-- Support deleting sessions [#198](https://github.com/jdneo/vscode-leetcode/issues/130)
+- Prompt to open the workspace for LeetCode [#130](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/130)
+- Support deleting sessions [#198](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/130)
### Fixed
-[Bugs fixed](https://github.com/jdneo/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.15.2+is%3Aclosed+label%3Abug)
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.15.2+is%3Aclosed+label%3Abug)
## [0.15.1]
### Fixed
-[Bugs fixed](https://github.com/jdneo/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.15.1+is%3Aclosed+label%3Abug)
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.15.1+is%3Aclosed+label%3Abug)
## [0.15.0]
### Added
-- Auto refresh the explorer after submitting [#91](https://github.com/jdneo/vscode-leetcode/issues/91)
-- Add a editor shortcut `Description` to show the problem description [#286](https://github.com/jdneo/vscode-leetcode/issues/286)
-- Support customizing the shortcuts in editor [#335](https://github.com/jdneo/vscode-leetcode/issues/335)
+- Auto refresh the explorer after submitting [#91](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/91)
+- Add a editor shortcut `Description` to show the problem description [#286](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/286)
+- Support customizing the shortcuts in editor [#335](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/335)
### Fixed
-[Bugs fixed](https://github.com/jdneo/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.15.0+is%3Aclosed+label%3Abug)
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.15.0+is%3Aclosed+label%3Abug)
## [0.14.3]
### Added
-- Support interpolation for `leetcode.outputFolder` settings [#151](https://github.com/jdneo/vscode-leetcode/issues/151)
+- Support interpolation for `leetcode.outputFolder` settings [#151](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/151)
### Fixed
-[Bugs fixed](https://github.com/jdneo/vscode-leetcode/issues?q=is%3Aissue+is%3Aclosed+milestone%3A0.14.3+label%3Abug)
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+is%3Aclosed+milestone%3A0.14.3+label%3Abug)
## [0.14.2]
### Added
-- Add the `All` category in the LeetCode Explorer [#184](https://github.com/jdneo/vscode-leetcode/issues/184)
-- Add shortcuts for `Show top voted solution` [#269](https://github.com/jdneo/vscode-leetcode/issues/269)
+- Add the `All` category in the LeetCode Explorer [#184](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/184)
+- Add shortcuts for `Show top voted solution` [#269](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/269)
### Fixed
-[Bugs fixed](https://github.com/jdneo/vscode-leetcode/issues?q=is%3Aissue+is%3Aclosed+label%3Abug+milestone%3A0.14.2)
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+is%3Aclosed+label%3Abug+milestone%3A0.14.2)
## [0.14.1]
### Added
-- Add setting `leetcode.showCommentDescription` to specify whether including the problem description in comments or not [#287](https://github.com/jdneo/vscode-leetcode/issues/287)
+- Add setting `leetcode.showCommentDescription` to specify whether including the problem description in comments or not [#287](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/287)
## [0.14.0]
### Added
-- Add setting `leetcode.enableShortcuts` to specify whether to show the submit/test shortcuts in editor [#146](https://github.com/jdneo/vscode-leetcode/issues/146)
-- Add `Like` and `Dislike` counts in the problem description [#267](https://github.com/jdneo/vscode-leetcode/issues/267)
+- Add setting `leetcode.enableShortcuts` to specify whether to show the submit/test shortcuts in editor [#146](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/146)
+- Add `Like` and `Dislike` counts in the problem description [#267](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/267)
### Changed
- Improve the `Preview`, `Result` and `Solution` views
### Fixed
-[Bugs fixed](https://github.com/jdneo/vscode-leetcode/issues?q=is%3Aissue+label%3Abug+is%3Aclosed+milestone%3A0.14.0)
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+label%3Abug+is%3Aclosed+milestone%3A0.14.0)
## [0.13.3]
### Fixed
@@ -60,51 +158,51 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
## [0.13.2]
### Added
-- Add a setting `leetcode.enableStatusBar` to specify whether the LeetCode status bar will be shown or not [#156](https://github.com/jdneo/vscode-leetcode/issues/156)
-- Add a setting `leetcode.nodePath` to specify the `Node.js` executable path [#227](https://github.com/jdneo/vscode-leetcode/issues/227)
+- Add a setting `leetcode.enableStatusBar` to specify whether the LeetCode status bar will be shown or not [#156](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/156)
+- Add a setting `leetcode.nodePath` to specify the `Node.js` executable path [#227](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/227)
### Changed
-- Update the activity bar icon, See: [#225](https://github.com/jdneo/vscode-leetcode/pull/225)
+- Update the activity bar icon, See: [#225](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/225)
### Fixed
-[Bugs fixed](https://github.com/jdneo/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.13.2+is%3Aclosed+label%3Abug)
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.13.2+is%3Aclosed+label%3Abug)
## [0.13.1]
### Fixed
-[Bugs fixed](https://github.com/jdneo/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.13.1+is%3Aclosed+label%3Abug)
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+milestone%3A0.13.1+is%3Aclosed+label%3Abug)
## [0.13.0]
### Added
-- Preview the problem description [#131](https://github.com/jdneo/vscode-leetcode/issues/131)
-- Show top voted solution [#193](https://github.com/jdneo/vscode-leetcode/pull/193)
-- Add `collapse all` for the explorer [#197](https://github.com/jdneo/vscode-leetcode/pull/197)
+- Preview the problem description [#131](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/131)
+- Show top voted solution [#193](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/193)
+- Add `collapse all` for the explorer [#197](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/197)
### Fixed
-[Bugs fixed](https://github.com/jdneo/vscode-leetcode/issues?q=is%3Aissue+is%3Aclosed+milestone%3A0.13.0+label%3Abug)
+[Bugs fixed](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues?q=is%3Aissue+is%3Aclosed+milestone%3A0.13.0+label%3Abug)
## [0.12.0]
### Added
-- Add new command `LeetCode: Switch Default Language` to support switching the default language [#115](https://github.com/jdneo/vscode-leetcode/issues/115)
-- Support `PHP` and `Rust` ([#83](https://github.com/jdneo/vscode-leetcode/issues/83), [#103](https://github.com/jdneo/vscode-leetcode/issues/103))
+- Add new command `LeetCode: Switch Default Language` to support switching the default language [#115](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/115)
+- Support `PHP` and `Rust` ([#83](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/83), [#103](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/103))
### Fixed
-- Cannot retrieve time and memory result [#105](https://github.com/jdneo/vscode-leetcode/issues/105)
-- Power operator displays in a wrong way [#74](https://github.com/jdneo/vscode-leetcode/issues/74)
+- Cannot retrieve time and memory result [#105](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/105)
+- Power operator displays in a wrong way [#74](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/74)
## [0.11.0]
### Added
-- Add new setting: `leetcode.outputFolder` to customize the sub-directory to save the files generated by 'Show Problem' [#119](https://github.com/jdneo/vscode-leetcode/issues/119)
-- Add tooltips for sub-category nodes in LeetCode Explorer [#143](https://github.com/jdneo/vscode-leetcode/pull/143)
+- Add new setting: `leetcode.outputFolder` to customize the sub-directory to save the files generated by 'Show Problem' [#119](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/119)
+- Add tooltips for sub-category nodes in LeetCode Explorer [#143](https://github.com/LeetCode-OpenSource/vscode-leetcode/pull/143)
### Changed
-- Now when triggering 'Show Problem', the extension will not generate a new file if it already exists [#59](https://github.com/jdneo/vscode-leetcode/issues/59)
+- Now when triggering 'Show Problem', the extension will not generate a new file if it already exists [#59](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/59)
### Fixed
-- Log in timeout when proxy is enabled [#117](https://github.com/jdneo/vscode-leetcode/issues/117)
+- Log in timeout when proxy is enabled [#117](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/117)
## [0.10.2]
### Fixed
-- Test cases cannot have double quotes [#60](https://github.com/jdneo/vscode-leetcode/issues/60)
+- Test cases cannot have double quotes [#60](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/60)
## [0.10.1]
### Changed
@@ -112,13 +210,13 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
## [0.10.0]
### Added
-- Add an extension setting to hide solved problems [#95](https://github.com/jdneo/vscode-leetcode/issues/95)
-- Support categorize problems by company, tag, difficulty and favorite [#67](https://github.com/jdneo/vscode-leetcode/issues/67)
+- Add an extension setting to hide solved problems [#95](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/95)
+- Support categorize problems by company, tag, difficulty and favorite [#67](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/67)
## [0.9.0]
### Changed
-- Improve the experience of switching endpoint [#85](https://github.com/jdneo/vscode-leetcode/issues/85)
-- Use web view to show the result page [#76](https://github.com/jdneo/vscode-leetcode/issues/76)
+- Improve the experience of switching endpoint [#85](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/85)
+- Use web view to show the result page [#76](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/76)
## [0.8.2]
@@ -126,7 +224,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
- Add Code Lens for submitting the answer to LeetCode
### Fixed
-- Fix the bug that the extension could not automatically sign in [#72](https://github.com/jdneo/vscode-leetcode/issues/72)
+- Fix the bug that the extension could not automatically sign in [#72](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/72)
## [0.8.1]
### Changed
@@ -134,67 +232,67 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
## [0.8.0]
### Added
-- Support LeetCode CN [#50](https://github.com/jdneo/vscode-leetcode/issues/50)
-- Support Windows Subsystem for Linux [#47](https://github.com/jdneo/vscode-leetcode/issues/47)
+- Support LeetCode CN [#50](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/50)
+- Support Windows Subsystem for Linux [#47](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/47)
## [0.7.0]
### Added
-- Add spinner when submitting code [#43](https://github.com/jdneo/vscode-leetcode/issues/43)
+- Add spinner when submitting code [#43](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/43)
## [0.6.1]
### Added
-- Add Sign in action into LeetCode Explorer title area [#25](https://github.com/jdneo/vscode-leetcode/issues/25)
+- Add Sign in action into LeetCode Explorer title area [#25](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/25)
## [0.6.0]
### Changed
-- Move LeetCode explorer into activity bar [#39](https://github.com/jdneo/vscode-leetcode/issues/39)
+- Move LeetCode explorer into activity bar [#39](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/39)
### Added
-- Support trigger test & submit in the editor [#37](https://github.com/jdneo/vscode-leetcode/issues/37)
+- Support trigger test & submit in the editor [#37](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/37)
### Fixed
-- Fix the bug that cannot show problem [#41](https://github.com/jdneo/vscode-leetcode/issues/41)
+- Fix the bug that cannot show problem [#41](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/41)
## [0.5.1]
### Fixed
-- Fix the bug when user's path contains white spaces [#34](https://github.com/jdneo/vscode-leetcode/issues/34)
+- Fix the bug when user's path contains white spaces [#34](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/34)
## [0.5.0]
### Added
-- Support submit and test solution files from the file explorer in VS Code ([#24](https://github.com/jdneo/vscode-leetcode/issues/24), [#26](https://github.com/jdneo/vscode-leetcode/issues/26))
+- Support submit and test solution files from the file explorer in VS Code ([#24](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/24), [#26](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/26))
## [0.4.0]
### Added
-- Support locked problem [#20](https://github.com/jdneo/vscode-leetcode/issues/20)
+- Support locked problem [#20](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/20)
### Changed
-- Simplify the command 'LeetCode: Test Current File' to 'LeetCode: Test' [#18](https://github.com/jdneo/vscode-leetcode/issues/18)
-- Will automatically save current file when 'LeetCode: Test' command is triggered [#17](https://github.com/jdneo/vscode-leetcode/issues/17)
+- Simplify the command 'LeetCode: Test Current File' to 'LeetCode: Test' [#18](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/18)
+- Will automatically save current file when 'LeetCode: Test' command is triggered [#17](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/17)
## [0.3.0]
### Added
-- Test current solution file [#15](https://github.com/jdneo/vscode-leetcode/issues/15)
+- Test current solution file [#15](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/15)
## [0.2.1]
### Fixed
-- Fix the wrong icon bug in LeetCode Explorer [#9](https://github.com/jdneo/vscode-leetcode/issues/9)
-- Fix the switch session bug when login session is expired [#12](https://github.com/jdneo/vscode-leetcode/issues/12)
+- Fix the wrong icon bug in LeetCode Explorer [#9](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/9)
+- Fix the switch session bug when login session is expired [#12](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/12)
## [0.2.0]
### Added
-- Support setting the default language to solve problems [#5](https://github.com/jdneo/vscode-leetcode/issues/5)
+- Support setting the default language to solve problems [#5](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/5)
### Fixed
-- When user cancels login, no further actions will happen [#10](https://github.com/jdneo/vscode-leetcode/issues/10)
+- When user cancels login, no further actions will happen [#10](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/10)
## [0.1.2]
### Fixed
-- Fix the duplicated nodes in LeetCode Explorer bug [#6](https://github.com/jdneo/vscode-leetcode/issues/6)
+- Fix the duplicated nodes in LeetCode Explorer bug [#6](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/6)
## [0.1.1]
### Fixed
-- Fix a bug in LeetCode Explorer [#3](https://github.com/jdneo/vscode-leetcode/issues/3)
-- Remove the show problem command from command palette [#4](https://github.com/jdneo/vscode-leetcode/issues/4)
+- Fix a bug in LeetCode Explorer [#3](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/3)
+- Remove the show problem command from command palette [#4](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/4)
## [0.1.0]
### Added
diff --git a/LICENSE b/LICENSE
index 4401d6f6..fffb65eb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,7 @@
MIT License
-Copyright (c) 2018 jdneo
+Copyright (c) 2020-present 力扣
+Copyright (c) 2018-2019 jdneo
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index a1d6e64d..623e95f2 100644
--- a/README.md
+++ b/README.md
@@ -3,39 +3,51 @@
> Solve LeetCode problems in VS Code
-
-
-
+
-
-
-
+
-
-
+
-- English Document | [中文文档](https://github.com/jdneo/vscode-leetcode/blob/master/docs/README_zh-CN.md)
+- English Document | [中文文档](https://github.com/LeetCode-OpenSource/vscode-leetcode/blob/master/docs/README_zh-CN.md)
+
+## ❗️ Attention ❗️- Workaround to login to LeetCode endpoint
+
+> Note: If you are using `leetcode.cn`, you can just ignore this section.
+
+Recently we observed that [the extension cannot login to leetcode.com endpoint anymore](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/478). The root cause of this issue is that leetcode.com changed its login mechanism and so far there is no ideal way to fix that issue.
+
+Thanks for [@yihong0618](https://github.com/yihong0618) provided a workaround which can somehow mitigate this. Now you can simply click the `Sign In` button and then select `Third Party` login or `Cookie` login.
+
+> Note: If you want to use third-party login(**Recommended**), please make sure your account has been connected to the third-party. If you want to use `Cookie` login, click [here](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/478#issuecomment-564757098) to see the steps.
## Requirements
+
- [VS Code 1.30.1+](https://code.visualstudio.com/)
-- [Node.js 8+](https://nodejs.org)
- > NOTE: Please make sure that `Node` is in your `PATH` environment variable. You can also use the setting `leetcode.nodePath` to specify the location of your `Node.js` executable.
+- [Node.js 10+](https://nodejs.org)
+ > NOTE: Please make sure that `Node` is in your `PATH` environment variable. You can also use the setting `leetcode.nodePath` to specify the location of your `Node.js` executable.
## Quick Start
-
+
## Features
### Sign In/Out
+
-
- Simply click `Sign in to LeetCode` in the `LeetCode Explorer` will let you **sign in** with your LeetCode account.
@@ -47,23 +59,26 @@
---
### Switch Endpoint
+
-
-- By clicking the button  at the **explorer's navigation bar**, you can switch between different endpoints.
+- By clicking the button  at the **explorer's navigation bar**, you can switch between different endpoints.
- The supported endpoints are:
+
- **leetcode.com**
- - **leetcode-cn.com**
+ - **leetcode.cn**
> Note: The accounts of different endpoints are **not** shared. Please make sure you are using the right endpoint. The extension will use `leetcode.com` by default.
---
### Pick a Problem
+
-
- Directly click on the problem or right click the problem in the `LeetCode Explorer` and select `Preview Problem` to see the problem description.
@@ -78,13 +93,16 @@
---
### Editor Shortcuts
+
-
-- The extension supports 4 editor shortcuts (aka Code Lens):
+- The extension supports 5 editor shortcuts (aka Code Lens):
+
- `Submit`: Submit your answer to LeetCode.
- `Test`: Test your answer with customized test cases.
+ - `Star/Unstar`: Star or unstar the current problem.
- `Solution`: Show the top voted solution for the current problem.
- `Description`: Show the problem description page.
@@ -93,49 +111,54 @@
---
### Search problems by Keywords
+
-
-- By clicking the button  at the **explorer's navigation bar**, you can search the problems by keywords.
+- By clicking the button  at the **explorer's navigation bar**, you can search the problems by keywords.
---
### Manage Session
+
-
- To manage your LeetCode sessions, just clicking the `LeetCode: ***` at the bottom of the status bar. You can **switch** between sessions or **create**, **delete** a session.
-
## Settings
-| Setting Name | Description | Default Value |
-| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
-| `leetcode.hideSolved` | Specify to hide the solved problems or not | `false` |
-| `leetcode.showLocked` | Specify to show the locked problems or not. Only Premium users could open the locked problems | `false` |
-| `leetcode.defaultLanguage` | Specify the default language used to solve the problem. Supported languages are: `bash`, `c`, `cpp`, `csharp`, `golang`, `java`, `javascript`, `kotlin`, `mysql`, `php`, `python`,`python3`,`ruby`,`rust`, `scala`,`swift` | `N/A` |
-| `leetcode.useWsl` | Specify whether to use WSL or not | `false` |
-| `leetcode.endpoint` | Specify the active endpoint. Supported endpoints are: `leetcode`, `leetcode-cn` | `leetcode` |
-| `leetcode.workspaceFolder` | Specify the path of the workspace folder to store the problem files. | `""` |
-| `leetcode.outputFolder` | Specify the relative path to save the problem files. Besides using customized path, there are also several reserved words which can be used here: `${tag}`: Categorize the problem according to their tags. `${language}`: Categorize the problem according to their language. `${difficulty}`: Categorize the problem according to their difficulty.
-
-
-
+
-
-
-
+
-
-
+
-- [English Document](https://github.com/jdneo/vscode-leetcode#requirements) | 中文文档
+- [English Document](https://github.com/LeetCode-OpenSource/vscode-leetcode#requirements) | 中文文档
+
+## ❗️ 注意 ❗️- 无法登录 LeetCode 节点的临时解决办法
+
+> 注意：如果使用的是 `leetcode.cn` 账户，可以跳过此段落。
+
+近期我们发现插件出现了[无法登录 leetcode.com 节点的问题](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/478)。原因是因为近期 leetcode.com 改变了登录机制，目前我们暂时没有找到解决该问题的完美解决方案。
+
+感谢 [@yihong0618](https://github.com/yihong0618) 提供了一个临时解决办法。现在你可以直接点击登录按钮并选择第三方登录或者 `Cookie` 登录。
+
+> 注意：如果你希望使用第三方登录（**推荐**），请确保你的账户已经与第三方账户连接。如果你希望通过 `Cookie` 登录，请点击[该连接](https://github.com/LeetCode-OpenSource/vscode-leetcode/issues/478#issuecomment-564757098)查看登录步骤。
## 运行条件
+
- [VS Code 1.23.0+](https://code.visualstudio.com/)
-- [Node.js 8+](https://nodejs.org)
- > 注意：请确保`Node`在`PATH`环境变量中。您也可以通过设定 `leetcode.nodePath` 选项来指定 `Node.js` 可执行文件的路径。
+- [Node.js 10+](https://nodejs.org)
+ > 注意：请确保`Node`在`PATH`环境变量中。您也可以通过设定 `leetcode.nodePath` 选项来指定 `Node.js` 可执行文件的路径。
## 快速开始
-
+
## 功能
### 登入登出
+
-
- 点击 `LeetCode Explorer` 中的 `Sign in to LeetCode` 即可登入。
-- 你也可以使用下来命令登入或登出:
+- 你也可以使用下来命令登入或利用 cookie 登入或登出:
- **LeetCode: Sign in**
- **LeetCode: Sign out**
---
### 切换 LeetCode 版本
+
-
-- LeetCode 目前有**英文版**和**中文版**两种版本。点击 `LeetCode Explorer` 导航栏中的  按钮可切换版本。
+- LeetCode 目前有**英文版**和**中文版**两种版本。点击 `LeetCode Explorer` 导航栏中的  按钮可切换版本。
- 目前可切换的版本有:
+
- **leetcode.com**
- - **leetcode-cn.com**
+ - **leetcode.cn**
> 注意：两种版本的 LeetCode 账户并**不通用**，请确保当前激活的版本是正确的。插件默认激活的是**英文版**。
---
### 选择题目
+
-
- 直接点击题目或者在 `LeetCode Explorer` 中**右键**题目并选择 `Preview Problem` 可查看题目描述
@@ -78,13 +93,16 @@
---
### 编辑器快捷方式
+
-
-- 插件会在编辑区域内支持四种不同的快捷方式（Code Lens）:
+- 插件会在编辑区域内支持五种不同的快捷方式（Code Lens）:
+
- `Submit`: 提交你的答案至 LeetCode；
- `Test`: 用给定的测试用例测试你的答案；
+ - `Star`: 收藏或取消收藏该问题；
- `Solution`: 显示该问题的高票解答；
- `Description`: 显示该问题的题目描述。
@@ -93,48 +111,52 @@
---
### 通过关键字搜索题目
+
-
-- 点击 `LeetCode Explorer` 导航栏中的  按钮可按照关键字搜索题目。
+- 点击 `LeetCode Explorer` 导航栏中的  按钮可按照关键字搜索题目。
---
### 管理存档
+
-
- 点击位于 VS Code 底部状态栏的 `LeetCode: ***` 管理 `LeetCode 存档`。你可以**切换**存档或者**创建**，**删除**存档。
-
## 插件配置项
-| 配置项名称 | 描述 | 默认值 |
-| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- |
-| `leetcode.hideSolved` | 指定是否要隐藏已解决的问题 | `false` |
-| `leetcode.showLocked` | 指定是否显示付费题目，只有付费账户才可以打开付费题目 | `false` |
-| `leetcode.defaultLanguage` | 指定答题时使用的默认语言，可选语言有：`bash`, `c`, `cpp`, `csharp`, `golang`, `java`, `javascript`, `kotlin`, `mysql`, `php`, `python`,`python3`,`ruby`, `rust`, `scala`,`swift` | `N/A` |
-| `leetcode.useWsl` | 指定是否启用 WSL | `false` |
-| `leetcode.endpoint` | 指定使用的终端，可用终端有：`leetcode`, `leetcode-cn` | `leetcode` |
-| `leetcode.workspaceFolder` | 指定保存文件的工作区目录 | `""` |
-| `leetcode.outputFolder` | 指定保存文件时所用的相对文件夹路径。除了用户自定义路径外，也可以使用保留项，包括：`${tag}`: 根据题目的类别进行分类。 `${language}`: 根据题目的语言进行分类。 `${difficulty}`: 根据题目的难度进行分类。
-
- LeetCode_36
- Created with Sketch.
-
-
-
-
+
+ LeetCode
+
+
+
\ No newline at end of file
diff --git a/resources/check.png b/resources/check.png
index ad7077df..84d2d100 100644
Binary files a/resources/check.png and b/resources/check.png differ
diff --git a/resources/dark/dislike.png b/resources/dark/dislike.png
new file mode 100644
index 00000000..47f17c57
Binary files /dev/null and b/resources/dark/dislike.png differ
diff --git a/resources/dark/endpoint.svg b/resources/dark/endpoint.svg
deleted file mode 100644
index c9b4d058..00000000
--- a/resources/dark/endpoint.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ("leetcode.enableShortcuts", true);
- }
}
export const codeLensController: CodeLensController = new CodeLensController();
diff --git a/src/codelens/CustomCodeLensProvider.ts b/src/codelens/CustomCodeLensProvider.ts
index f201dbd7..4b9b6491 100644
--- a/src/codelens/CustomCodeLensProvider.ts
+++ b/src/codelens/CustomCodeLensProvider.ts
@@ -2,6 +2,8 @@
// Licensed under the MIT license.
import * as vscode from "vscode";
+import { explorerNodeManager } from "../explorer/explorerNodeManager";
+import { LeetCodeNode } from "../explorer/LeetCodeNode";
import { getEditorShortcuts } from "../utils/settingUtils";
export class CustomCodeLensProvider implements vscode.CodeLensProvider {
@@ -22,13 +24,27 @@ export class CustomCodeLensProvider implements vscode.CodeLensProvider {
return;
}
- const fileName: string = document.fileName.trim();
- const matchResult: RegExpMatchArray | null = fileName.match(/\d+\..*\.(.+)/);
+ const content: string = document.getText();
+ const matchResult: RegExpMatchArray | null = content.match(/@lc app=.* id=(.*) lang=.*/);
if (!matchResult) {
return undefined;
}
+ const nodeId: string | undefined = matchResult[1];
+ let node: LeetCodeNode | undefined;
+ if (nodeId) {
+ node = explorerNodeManager.getNodeById(nodeId);
+ }
+
+ let codeLensLine: number = document.lineCount - 1;
+ for (let i: number = document.lineCount - 1; i >= 0; i--) {
+ const lineContent: string = document.lineAt(i).text;
+ if (lineContent.indexOf("@lc code=end") >= 0) {
+ codeLensLine = i;
+ break;
+ }
+ }
- const range: vscode.Range = new vscode.Range(document.lineCount - 1, 0, document.lineCount - 1, 0);
+ const range: vscode.Range = new vscode.Range(codeLensLine, 0, codeLensLine, 0);
const codeLens: vscode.CodeLens[] = [];
if (shortcuts.indexOf("submit") >= 0) {
@@ -47,6 +63,14 @@ export class CustomCodeLensProvider implements vscode.CodeLensProvider {
}));
}
+ if (shortcuts.indexOf("star") >= 0 && node) {
+ codeLens.push(new vscode.CodeLens(range, {
+ title: node.isFavorite ? "Unstar" : "Star",
+ command: node.isFavorite ? "leetcode.removeFavorite" : "leetcode.addFavorite",
+ arguments: [node],
+ }));
+ }
+
if (shortcuts.indexOf("solution") >= 0) {
codeLens.push(new vscode.CodeLens(range, {
title: "Solution",
@@ -66,3 +90,5 @@ export class CustomCodeLensProvider implements vscode.CodeLensProvider {
return codeLens;
}
}
+
+export const customCodeLensProvider: CustomCodeLensProvider = new CustomCodeLensProvider();
diff --git a/src/commands/list.ts b/src/commands/list.ts
index 5cb44137..3ebe236a 100644
--- a/src/commands/list.ts
+++ b/src/commands/list.ts
@@ -1,10 +1,10 @@
// Copyright (c) jdneo. All rights reserved.
// Licensed under the MIT license.
-import * as vscode from "vscode";
import { leetCodeExecutor } from "../leetCodeExecutor";
import { leetCodeManager } from "../leetCodeManager";
import { IProblem, ProblemState, UserStatus } from "../shared";
+import * as settingUtils from "../utils/settingUtils";
import { DialogType, promptForOpenOutputChannel } from "../utils/uiUtils";
export async function listProblems(): Promise {
@@ -12,9 +12,9 @@ export async function listProblems(): Promise {
if (leetCodeManager.getStatus() === UserStatus.SignedOut) {
return [];
}
- const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
- const showLocked: boolean = !!leetCodeConfig.get("showLocked");
- const result: string = await leetCodeExecutor.listProblems(showLocked);
+
+ const useEndpointTranslation: boolean = settingUtils.shouldUseEndpointTranslation();
+ const result: string = await leetCodeExecutor.listProblems(true, useEndpointTranslation);
const problems: IProblem[] = [];
const lines: string[] = result.split("\n");
const reg: RegExp = /^(.)\s(.{1,2})\s(.)\s\[\s*(\d*)\s*\]\s*(.*)\s*(Easy|Medium|Hard)\s*\((\s*\d+\.\d+ %)\)/;
diff --git a/src/commands/plugin.ts b/src/commands/plugin.ts
index 481bd6dd..d2ed4b6c 100644
--- a/src/commands/plugin.ts
+++ b/src/commands/plugin.ts
@@ -2,9 +2,10 @@
// Licensed under the MIT license.
import * as vscode from "vscode";
+import { leetCodeTreeDataProvider } from "../explorer/LeetCodeTreeDataProvider";
import { leetCodeExecutor } from "../leetCodeExecutor";
import { IQuickItemEx } from "../shared";
-import { Endpoint } from "../shared";
+import { Endpoint, SortingStrategy } from "../shared";
import { DialogType, promptForOpenOutputChannel, promptForSignIn } from "../utils/uiUtils";
import { deleteCache } from "./cache";
@@ -20,7 +21,7 @@ export async function switchEndpoint(): Promise {
},
{
label: `${isCnEnabled ? "$(check) " : ""}力扣`,
- description: "leetcode-cn.com",
+ description: "leetcode.cn",
detail: `启用中国版 LeetCode`,
value: Endpoint.LeetCodeCN,
},
@@ -52,3 +53,36 @@ export function getLeetCodeEndpoint(): string {
const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
return leetCodeConfig.get("endpoint", Endpoint.LeetCode);
}
+
+const SORT_ORDER: SortingStrategy[] = [
+ SortingStrategy.None,
+ SortingStrategy.AcceptanceRateAsc,
+ SortingStrategy.AcceptanceRateDesc,
+];
+
+export async function switchSortingStrategy(): Promise {
+ const currentStrategy: SortingStrategy = getSortingStrategy();
+ const picks: Array> = [];
+ picks.push(
+ ...SORT_ORDER.map((s: SortingStrategy) => {
+ return {
+ label: `${currentStrategy === s ? "$(check)" : " "} ${s}`,
+ value: s,
+ };
+ }),
+ );
+
+ const choice: IQuickItemEx | undefined = await vscode.window.showQuickPick(picks);
+ if (!choice || choice.value === currentStrategy) {
+ return;
+ }
+
+ const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
+ await leetCodeConfig.update("problems.sortStrategy", choice.value, true);
+ await leetCodeTreeDataProvider.refresh();
+}
+
+export function getSortingStrategy(): SortingStrategy {
+ const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
+ return leetCodeConfig.get("problems.sortStrategy", SortingStrategy.None);
+}
diff --git a/src/commands/show.ts b/src/commands/show.ts
index 896516a9..eccf5571 100644
--- a/src/commands/show.ts
+++ b/src/commands/show.ts
@@ -1,7 +1,7 @@
// Copyright (c) jdneo. All rights reserved.
// Licensed under the MIT license.
-import * as fse from "fs-extra";
+import * as _ from "lodash";
import * as path from "path";
import * as unescapeJS from "unescape-js";
import * as vscode from "vscode";
@@ -10,17 +10,30 @@ import { LeetCodeNode } from "../explorer/LeetCodeNode";
import { leetCodeChannel } from "../leetCodeChannel";
import { leetCodeExecutor } from "../leetCodeExecutor";
import { leetCodeManager } from "../leetCodeManager";
-import { IProblem, IQuickItemEx, languages, ProblemState } from "../shared";
-import { getNodeIdFromFile } from "../utils/problemUtils";
-import { DialogOptions, DialogType, openSettingsEditor, promptForOpenOutputChannel, promptForSignIn, promptHintMessage } from "../utils/uiUtils";
-import { selectWorkspaceFolder } from "../utils/workspaceUtils";
+import { Endpoint, IProblem, IQuickItemEx, languages, PREMIUM_URL_CN, PREMIUM_URL_GLOBAL, ProblemState } from "../shared";
+import { genFileExt, genFileName, getNodeIdFromFile } from "../utils/problemUtils";
+import * as settingUtils from "../utils/settingUtils";
+import { IDescriptionConfiguration } from "../utils/settingUtils";
+import {
+ DialogOptions,
+ DialogType,
+ openSettingsEditor,
+ openUrl,
+ promptForOpenOutputChannel,
+ promptForSignIn,
+ promptHintMessage,
+} from "../utils/uiUtils";
+import { getActiveFilePath, selectWorkspaceFolder } from "../utils/workspaceUtils";
import * as wsl from "../utils/wslUtils";
import { leetCodePreviewProvider } from "../webview/leetCodePreviewProvider";
import { leetCodeSolutionProvider } from "../webview/leetCodeSolutionProvider";
import * as list from "./list";
+import { getLeetCodeEndpoint } from "./plugin";
+import { globalState } from "../globalState";
export async function previewProblem(input: IProblem | vscode.Uri, isSideMode: boolean = false): Promise {
let node: IProblem;
+
if (input instanceof vscode.Uri) {
const activeFilePath: string = input.fsPath;
const id: string = await getNodeIdFromFile(activeFilePath);
@@ -38,12 +51,25 @@ export async function previewProblem(input: IProblem | vscode.Uri, isSideMode: b
isSideMode = true;
} else {
node = input;
+ const { isPremium } = globalState.getUserStatus() ?? {};
+ if (input.locked && !isPremium) {
+ const url = getLeetCodeEndpoint() === Endpoint.LeetCode ? PREMIUM_URL_GLOBAL : PREMIUM_URL_CN;
+ openUrl(url);
+ return;
+ }
}
- const descString: string = await leetCodeExecutor.getDescription(node.id);
+ const needTranslation: boolean = settingUtils.shouldUseEndpointTranslation();
+ const descString: string = await leetCodeExecutor.getDescription(node.id, needTranslation);
leetCodePreviewProvider.show(descString, node, isSideMode);
}
+export async function pickOne(): Promise {
+ const problems: IProblem[] = await list.listProblems();
+ const randomProblem: IProblem = problems[Math.floor(Math.random() * problems.length)];
+ await showProblemInternal(randomProblem);
+}
+
export async function showProblem(node?: LeetCodeNode): Promise {
if (!node) {
return;
@@ -56,13 +82,10 @@ export async function searchProblem(): Promise {
promptForSignIn();
return;
}
- const choice: IQuickItemEx | undefined = await vscode.window.showQuickPick(
- parseProblemsToPicks(list.listProblems()),
- {
- matchOnDetail: true,
- placeHolder: "Select one problem",
- },
- );
+ const choice: IQuickItemEx | undefined = await vscode.window.showQuickPick(parseProblemsToPicks(list.listProblems()), {
+ matchOnDetail: true,
+ placeHolder: "Select one problem",
+ });
if (!choice) {
return;
}
@@ -72,10 +95,17 @@ export async function searchProblem(): Promise {
export async function showSolution(input: LeetCodeNode | vscode.Uri): Promise {
let problemInput: string | undefined;
if (input instanceof LeetCodeNode) {
+ // Triggerred from explorer
problemInput = input.id;
} else if (input instanceof vscode.Uri) {
+ // Triggerred from Code Lens/context menu
problemInput = `"${input.fsPath}"`;
- } else {
+ } else if (!input) {
+ // Triggerred from command
+ problemInput = await getActiveFilePath();
+ }
+
+ if (!problemInput) {
vscode.window.showErrorMessage("Invalid input to fetch the solution data.");
return;
}
@@ -85,7 +115,8 @@ export async function showSolution(input: LeetCodeNode | vscode.Uri): Promise {
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", ignoreFocusOut: true });
+ const language: string | undefined =
+ defaultLanguage ||
+ (await vscode.window.showQuickPick(languages, {
+ placeHolder: "Select the language you want to use",
+ ignoreFocusOut: true,
+ }));
// fire-and-forget default language query
(async (): Promise => {
if (language && !defaultLanguage && leetCodeConfig.get("hint.setDefaultLanguage")) {
@@ -107,7 +143,7 @@ async function fetchProblemLanguage(): Promise {
`Would you like to set '${language}' as your default language?`,
DialogOptions.yes,
DialogOptions.no,
- DialogOptions.never,
+ DialogOptions.never
);
if (choice === DialogOptions.yes) {
leetCodeConfig.update("defaultLanguage", language, true /* UserSetting */);
@@ -127,54 +163,72 @@ async function showProblemInternal(node: IProblem): Promise {
}
const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
- let outDir: string = await selectWorkspaceFolder();
- if (!outDir) {
+ const workspaceFolder: string = await selectWorkspaceFolder();
+ if (!workspaceFolder) {
return;
}
- let relativePath: string = (leetCodeConfig.get("outputFolder", "")).trim();
- if (relativePath) {
- relativePath = await resolveRelativePath(relativePath, node, language);
- if (!relativePath) {
+ const fileFolder: string = leetCodeConfig
+ .get(`filePath.${language}.folder`, leetCodeConfig.get(`filePath.default.folder`, ""))
+ .trim();
+ const fileName: string = leetCodeConfig
+ .get(`filePath.${language}.filename`, leetCodeConfig.get(`filePath.default.filename`) || genFileName(node, language))
+ .trim();
+
+ let finalPath: string = path.join(workspaceFolder, fileFolder, fileName);
+
+ if (finalPath) {
+ finalPath = await resolveRelativePath(finalPath, node, language);
+ if (!finalPath) {
leetCodeChannel.appendLine("Showing problem canceled by user.");
return;
}
}
- outDir = path.join(outDir, relativePath);
- await fse.ensureDir(outDir);
+ finalPath = wsl.useWsl() ? await wsl.toWinPath(finalPath) : finalPath;
+
+ const descriptionConfig: IDescriptionConfiguration = settingUtils.getDescriptionConfiguration();
+ const needTranslation: boolean = settingUtils.shouldUseEndpointTranslation();
- const originFilePath: string = await leetCodeExecutor.showProblem(node, language, outDir, leetCodeConfig.get("showCommentDescription"));
- const filePath: string = wsl.useWsl() ? await wsl.toWinPath(originFilePath) : originFilePath;
- await Promise.all([
- vscode.window.showTextDocument(vscode.Uri.file(filePath), { preview: false, viewColumn: vscode.ViewColumn.One }),
- movePreviewAsideIfNeeded(node),
+ await leetCodeExecutor.showProblem(node, language, finalPath, descriptionConfig.showInComment, needTranslation);
+ const promises: any[] = [
+ vscode.window.showTextDocument(vscode.Uri.file(finalPath), {
+ preview: false,
+ viewColumn: vscode.ViewColumn.One,
+ }),
promptHintMessage(
"hint.commentDescription",
- 'You can generate the code file with problem description in the comments by enabling "leetcode.showCommentDescription".',
+ 'You can config how to show the problem description through "leetcode.showDescription".',
"Open settings",
- (): Promise => openSettingsEditor("leetcode.showCommentDescription"),
+ (): Promise => openSettingsEditor("leetcode.showDescription")
),
- ]);
+ ];
+ if (descriptionConfig.showInWebview) {
+ promises.push(showDescriptionView(node));
+ }
+
+ await Promise.all(promises);
} catch (error) {
await promptForOpenOutputChannel(`${error} Please open the output channel for details.`, DialogType.error);
}
}
-async function movePreviewAsideIfNeeded(node: IProblem): Promise {
- if (vscode.workspace.getConfiguration("leetcode").get("enableSideMode", true)) {
- return previewProblem(node, true);
- }
+async function showDescriptionView(node: IProblem): Promise {
+ return previewProblem(node, vscode.workspace.getConfiguration("leetcode").get("enableSideMode", true));
}
-
async function parseProblemsToPicks(p: Promise): Promise>> {
return new Promise(async (resolve: (res: Array>) => void): Promise => {
- const picks: Array> = (await p).map((problem: IProblem) => Object.assign({}, {
- label: `${parseProblemDecorator(problem.state, problem.locked)}${problem.id}.${problem.name}`,
- description: "",
- detail: `AC rate: ${problem.passRate}, Difficulty: ${problem.difficulty}`,
- value: problem,
- }));
+ const picks: Array> = (await p).map((problem: IProblem) =>
+ Object.assign(
+ {},
+ {
+ label: `${parseProblemDecorator(problem.state, problem.locked)}${problem.id}.${problem.name}`,
+ description: "",
+ detail: `AC rate: ${problem.passRate}, Difficulty: ${problem.difficulty}`,
+ value: problem,
+ }
+ )
+ );
resolve(picks);
});
}
@@ -191,38 +245,69 @@ function parseProblemDecorator(state: ProblemState, locked: boolean): string {
}
async function resolveRelativePath(relativePath: string, node: IProblem, selectedLanguage: string): Promise {
+ let tag: string = "";
if (/\$\{tag\}/i.test(relativePath)) {
- const tag: string | undefined = await resolveTagForProblem(node);
- if (!tag) {
- return "";
- }
- relativePath = relativePath.replace(/\$\{tag\}/ig, tag);
+ tag = (await resolveTagForProblem(node)) || "";
}
- relativePath = relativePath.replace(/\$\{language\}/ig, selectedLanguage);
- relativePath = relativePath.replace(/\$\{difficulty\}/ig, node.difficulty.toLocaleLowerCase());
-
- // Check if there is any unsupported configuration
- const matchResult: RegExpMatchArray | null = relativePath.match(/\$\{(.*?)\}/);
- if (matchResult && matchResult.length >= 1) {
- const errorMsg: string = `The config '${matchResult[1]}' is not supported.`;
- leetCodeChannel.appendLine(errorMsg);
- throw new Error(errorMsg);
+ let company: string = "";
+ if (/\$\{company\}/i.test(relativePath)) {
+ company = (await resolveCompanyForProblem(node)) || "";
}
- return relativePath;
+ return relativePath.replace(/\$\{(.*?)\}/g, (_substring: string, ...args: string[]) => {
+ const placeholder: string = args[0].toLowerCase().trim();
+ switch (placeholder) {
+ case "id":
+ return node.id;
+ case "name":
+ return node.name;
+ case "camelcasename":
+ return _.camelCase(node.name);
+ case "pascalcasename":
+ return _.upperFirst(_.camelCase(node.name));
+ case "kebabcasename":
+ case "kebab-case-name":
+ return _.kebabCase(node.name);
+ case "snakecasename":
+ case "snake_case_name":
+ return _.snakeCase(node.name);
+ case "ext":
+ return genFileExt(selectedLanguage);
+ case "language":
+ return selectedLanguage;
+ case "difficulty":
+ return node.difficulty.toLocaleLowerCase();
+ case "tag":
+ return tag;
+ case "company":
+ return company;
+ default:
+ const errorMsg: string = `The config '${placeholder}' is not supported.`;
+ leetCodeChannel.appendLine(errorMsg);
+ throw new Error(errorMsg);
+ }
+ });
}
async function resolveTagForProblem(problem: IProblem): Promise {
if (problem.tags.length === 1) {
return problem.tags[0];
}
- return await vscode.window.showQuickPick(
- problem.tags,
- {
- matchOnDetail: true,
- placeHolder: "Multiple tags available, please select one",
- ignoreFocusOut: true,
- },
- );
+ return await vscode.window.showQuickPick(problem.tags, {
+ matchOnDetail: true,
+ placeHolder: "Multiple tags available, please select one",
+ ignoreFocusOut: true,
+ });
+}
+
+async function resolveCompanyForProblem(problem: IProblem): Promise {
+ if (problem.companies.length === 1) {
+ return problem.companies[0];
+ }
+ return await vscode.window.showQuickPick(problem.companies, {
+ matchOnDetail: true,
+ placeHolder: "Multiple tags available, please select one",
+ ignoreFocusOut: true,
+ });
}
diff --git a/src/commands/star.ts b/src/commands/star.ts
new file mode 100644
index 00000000..36611499
--- /dev/null
+++ b/src/commands/star.ts
@@ -0,0 +1,34 @@
+
+// Copyright (c) jdneo. All rights reserved.
+// Licensed under the MIT license.
+
+import { customCodeLensProvider } from "../codelens/CustomCodeLensProvider";
+import { LeetCodeNode } from "../explorer/LeetCodeNode";
+import { leetCodeTreeDataProvider } from "../explorer/LeetCodeTreeDataProvider";
+import { leetCodeExecutor } from "../leetCodeExecutor";
+import { hasStarShortcut } from "../utils/settingUtils";
+import { DialogType, promptForOpenOutputChannel } from "../utils/uiUtils";
+
+export async function addFavorite(node: LeetCodeNode): Promise {
+ try {
+ await leetCodeExecutor.toggleFavorite(node, true);
+ await leetCodeTreeDataProvider.refresh();
+ if (hasStarShortcut()) {
+ customCodeLensProvider.refresh();
+ }
+ } catch (error) {
+ await promptForOpenOutputChannel("Failed to add the problem to favorite. Please open the output channel for details.", DialogType.error);
+ }
+}
+
+export async function removeFavorite(node: LeetCodeNode): Promise {
+ try {
+ await leetCodeExecutor.toggleFavorite(node, false);
+ await leetCodeTreeDataProvider.refresh();
+ if (hasStarShortcut()) {
+ customCodeLensProvider.refresh();
+ }
+ } catch (error) {
+ await promptForOpenOutputChannel("Failed to remove the problem from favorite. Please open the output channel for details.", DialogType.error);
+ }
+}
diff --git a/src/commands/test.ts b/src/commands/test.ts
index 262f7339..d070c9aa 100644
--- a/src/commands/test.ts
+++ b/src/commands/test.ts
@@ -65,7 +65,7 @@ export async function testSolution(uri?: vscode.Uri): Promise {
}
break;
case ":file":
- const testFile: vscode.Uri[] | undefined = await showFileSelectDialog();
+ const testFile: vscode.Uri[] | undefined = await showFileSelectDialog(filePath);
if (testFile && testFile.length) {
const input: string = (await fse.readFile(testFile[0].fsPath, "utf-8")).trim();
if (input) {
diff --git a/src/explorer/LeetCodeNode.ts b/src/explorer/LeetCodeNode.ts
index 67aad324..3d2cc74f 100644
--- a/src/explorer/LeetCodeNode.ts
+++ b/src/explorer/LeetCodeNode.ts
@@ -1,7 +1,7 @@
// Copyright (c) jdneo. All rights reserved.
// Licensed under the MIT license.
-import { Command } from "vscode";
+import { Command, Uri } from "vscode";
import { IProblem, ProblemState } from "../shared";
export class LeetCodeNode {
@@ -55,4 +55,17 @@ export class LeetCodeNode {
};
}
+ public get acceptanceRate(): number {
+ return Number(this.passRate.slice(0, -1).trim());
+ }
+
+ public get uri(): Uri {
+ return Uri.from({
+ scheme: "leetcode",
+ authority: this.isProblem ? "problems" : "tree-node",
+ path: `/${this.id}`, // path must begin with slash /
+ query: `difficulty=${this.difficulty}`,
+ });
+ }
+
}
diff --git a/src/explorer/LeetCodeTreeDataProvider.ts b/src/explorer/LeetCodeTreeDataProvider.ts
index ac115424..9c298944 100644
--- a/src/explorer/LeetCodeTreeDataProvider.ts
+++ b/src/explorer/LeetCodeTreeDataProvider.ts
@@ -8,12 +8,14 @@ import { leetCodeManager } from "../leetCodeManager";
import { Category, defaultProblem, ProblemState } from "../shared";
import { explorerNodeManager } from "./explorerNodeManager";
import { LeetCodeNode } from "./LeetCodeNode";
+import { globalState } from "../globalState";
export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider {
-
private context: vscode.ExtensionContext;
- private onDidChangeTreeDataEvent: vscode.EventEmitter = new vscode.EventEmitter();
+ private onDidChangeTreeDataEvent: vscode.EventEmitter = new vscode.EventEmitter<
+ LeetCodeNode | undefined | null
+ >();
// tslint:disable-next-line:member-ordering
public readonly onDidChangeTreeData: vscode.Event = this.onDidChangeTreeDataEvent.event;
@@ -23,7 +25,7 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider {
await explorerNodeManager.refreshCache();
- this.onDidChangeTreeDataEvent.fire();
+ this.onDidChangeTreeDataEvent.fire(null);
}
public getTreeItem(element: LeetCodeNode): vscode.TreeItem | Thenable {
@@ -38,29 +40,41 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider {
if (!leetCodeManager.getUser()) {
return [
- new LeetCodeNode(Object.assign({}, defaultProblem, {
- id: "notSignIn",
- name: "Sign in to LeetCode",
- }), false),
+ new LeetCodeNode(
+ Object.assign({}, defaultProblem, {
+ id: "notSignIn",
+ name: "Sign in to LeetCode",
+ }),
+ false
+ ),
];
}
- if (!element) { // Root view
+ if (!element) {
+ // Root view
return explorerNodeManager.getRootNodes();
} else {
- switch (element.id) { // First-level
+ switch (element.id) {
case Category.All:
return explorerNodeManager.getAllNodes();
case Category.Favorite:
@@ -84,13 +98,14 @@ export class LeetCodeTreeDataProvider implements vscode.TreeDataProvider {
+ if (!this.isDifficultyBadgeEnabled()) {
+ return;
+ }
+
+ if (uri.scheme !== "leetcode" && uri.authority !== "problems") {
+ return;
+ }
+
+ const params: URLSearchParams = new URLSearchParams(uri.query);
+ const difficulty: string = params.get("difficulty")!.toLowerCase();
+ return {
+ badge: this.DIFFICULTY_BADGE_LABEL[difficulty],
+ color: this.ITEM_COLOR[difficulty],
+ };
+ }
+
+ private isDifficultyBadgeEnabled(): boolean {
+ const configuration: WorkspaceConfiguration = workspace.getConfiguration();
+ return configuration.get("leetcode.colorizeProblems", false);
+ }
+}
+
+export const leetCodeTreeItemDecorationProvider: LeetCodeTreeItemDecorationProvider = new LeetCodeTreeItemDecorationProvider();
diff --git a/src/explorer/explorerNodeManager.ts b/src/explorer/explorerNodeManager.ts
index 95053263..a04ad55c 100644
--- a/src/explorer/explorerNodeManager.ts
+++ b/src/explorer/explorerNodeManager.ts
@@ -4,7 +4,8 @@
import * as _ from "lodash";
import { Disposable } from "vscode";
import * as list from "../commands/list";
-import { Category, defaultProblem, ProblemState } from "../shared";
+import { getSortingStrategy } from "../commands/plugin";
+import { Category, defaultProblem, ProblemState, SortingStrategy } from "../shared";
import { shouldHideSolvedProblem } from "../utils/settingUtils";
import { LeetCodeNode } from "./LeetCodeNode";
@@ -56,7 +57,9 @@ class ExplorerNodeManager implements Disposable {
}
public getAllNodes(): LeetCodeNode[] {
- return Array.from(this.explorerNodeMap.values());
+ return this.applySortingStrategy(
+ Array.from(this.explorerNodeMap.values()),
+ );
}
public getAllDifficultyNodes(): LeetCodeNode[] {
@@ -114,7 +117,7 @@ class ExplorerNodeManager implements Disposable {
res.push(node);
}
}
- return res;
+ return this.applySortingStrategy(res);
}
public getChildrenNodesById(id: string): LeetCodeNode[] {
@@ -142,7 +145,7 @@ class ExplorerNodeManager implements Disposable {
break;
}
}
- return res;
+ return this.applySortingStrategy(res);
}
public dispose(): void {
@@ -186,6 +189,15 @@ class ExplorerNodeManager implements Disposable {
break;
}
}
+
+ private applySortingStrategy(nodes: LeetCodeNode[]): LeetCodeNode[] {
+ const strategy: SortingStrategy = getSortingStrategy();
+ switch (strategy) {
+ case SortingStrategy.AcceptanceRateAsc: return nodes.sort((x: LeetCodeNode, y: LeetCodeNode) => Number(x.acceptanceRate) - Number(y.acceptanceRate));
+ case SortingStrategy.AcceptanceRateDesc: return nodes.sort((x: LeetCodeNode, y: LeetCodeNode) => Number(y.acceptanceRate) - Number(x.acceptanceRate));
+ default: return nodes;
+ }
+ }
}
export const explorerNodeManager: ExplorerNodeManager = new ExplorerNodeManager();
diff --git a/src/extension.ts b/src/extension.ts
index 4d33d803..439673f8 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -8,11 +8,13 @@ import { switchDefaultLanguage } from "./commands/language";
import * as plugin from "./commands/plugin";
import * as session from "./commands/session";
import * as show from "./commands/show";
+import * as star from "./commands/star";
import * as submit from "./commands/submit";
import * as test from "./commands/test";
import { explorerNodeManager } from "./explorer/explorerNodeManager";
import { LeetCodeNode } from "./explorer/LeetCodeNode";
import { leetCodeTreeDataProvider } from "./explorer/LeetCodeTreeDataProvider";
+import { leetCodeTreeItemDecorationProvider } from "./explorer/LeetCodeTreeItemDecorationProvider";
import { leetCodeChannel } from "./leetCodeChannel";
import { leetCodeExecutor } from "./leetCodeExecutor";
import { leetCodeManager } from "./leetCodeManager";
@@ -22,10 +24,12 @@ import { leetCodePreviewProvider } from "./webview/leetCodePreviewProvider";
import { leetCodeSolutionProvider } from "./webview/leetCodeSolutionProvider";
import { leetCodeSubmissionProvider } from "./webview/leetCodeSubmissionProvider";
import { markdownEngine } from "./webview/markdownEngine";
+import TrackData from "./utils/trackingUtils";
+import { globalState } from "./globalState";
export async function activate(context: vscode.ExtensionContext): Promise {
try {
- if (!await leetCodeExecutor.meetRequirements()) {
+ if (!(await leetCodeExecutor.meetRequirements(context))) {
throw new Error("The environment doesn't meet requirements.");
}
@@ -35,6 +39,7 @@ export async function activate(context: vscode.ExtensionContext): Promise
});
leetCodeTreeDataProvider.initialize(context);
+ globalState.initialize(context);
context.subscriptions.push(
leetCodeStatusBarController,
@@ -46,24 +51,58 @@ export async function activate(context: vscode.ExtensionContext): Promise
markdownEngine,
codeLensController,
explorerNodeManager,
+ vscode.window.registerFileDecorationProvider(leetCodeTreeItemDecorationProvider),
vscode.window.createTreeView("leetCodeExplorer", { treeDataProvider: leetCodeTreeDataProvider, showCollapseAll: true }),
vscode.commands.registerCommand("leetcode.deleteCache", () => cache.deleteCache()),
vscode.commands.registerCommand("leetcode.toggleLeetCodeCn", () => plugin.switchEndpoint()),
vscode.commands.registerCommand("leetcode.signin", () => leetCodeManager.signIn()),
vscode.commands.registerCommand("leetcode.signout", () => leetCodeManager.signOut()),
vscode.commands.registerCommand("leetcode.manageSessions", () => session.manageSessions()),
- vscode.commands.registerCommand("leetcode.previewProblem", (node: LeetCodeNode) => show.previewProblem(node)),
+ vscode.commands.registerCommand("leetcode.previewProblem", (node: LeetCodeNode) => {
+ TrackData.report({
+ event_key: `vscode_open_problem`,
+ type: "click",
+ extra: JSON.stringify({
+ problem_id: node.id,
+ problem_name: node.name,
+ }),
+ });
+ show.previewProblem(node);
+ }),
vscode.commands.registerCommand("leetcode.showProblem", (node: LeetCodeNode) => show.showProblem(node)),
+ vscode.commands.registerCommand("leetcode.pickOne", () => show.pickOne()),
vscode.commands.registerCommand("leetcode.searchProblem", () => show.searchProblem()),
vscode.commands.registerCommand("leetcode.showSolution", (input: LeetCodeNode | vscode.Uri) => show.showSolution(input)),
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)),
+ vscode.commands.registerCommand("leetcode.testSolution", (uri?: vscode.Uri) => {
+ TrackData.report({
+ event_key: `vscode_runCode`,
+ type: "click",
+ extra: JSON.stringify({
+ path: uri?.path,
+ }),
+ });
+ return test.testSolution(uri);
+ }),
+ vscode.commands.registerCommand("leetcode.submitSolution", (uri?: vscode.Uri) => {
+ TrackData.report({
+ event_key: `vscode_submit`,
+ type: "click",
+ extra: JSON.stringify({
+ path: uri?.path,
+ }),
+ });
+ return submit.submitSolution(uri);
+ }),
vscode.commands.registerCommand("leetcode.switchDefaultLanguage", () => switchDefaultLanguage()),
+ vscode.commands.registerCommand("leetcode.addFavorite", (node: LeetCodeNode) => star.addFavorite(node)),
+ vscode.commands.registerCommand("leetcode.removeFavorite", (node: LeetCodeNode) => star.removeFavorite(node)),
+ vscode.commands.registerCommand("leetcode.problems.sort", () => plugin.switchSortingStrategy())
);
await leetCodeExecutor.switchEndpoint(plugin.getLeetCodeEndpoint());
- leetCodeManager.getLoginStatus();
+ await leetCodeManager.getLoginStatus();
+ vscode.window.registerUriHandler({ handleUri: leetCodeManager.handleUriSignIn });
} catch (error) {
leetCodeChannel.appendLine(error.toString());
promptForOpenOutputChannel("Extension initialization failed. Please open output channel for details.", DialogType.error);
diff --git a/src/globalState.ts b/src/globalState.ts
new file mode 100644
index 00000000..49d38421
--- /dev/null
+++ b/src/globalState.ts
@@ -0,0 +1,55 @@
+// Copyright (c) leo.zhao. All rights reserved.
+// Licensed under the MIT license.
+
+import * as vscode from "vscode";
+
+const CookieKey = "leetcode-cookie";
+const UserStatusKey = "leetcode-user-status";
+
+export type UserDataType = {
+ isSignedIn: boolean;
+ isPremium: boolean;
+ username: string;
+ avatar: string;
+ isVerified?: boolean;
+};
+
+class GlobalState {
+ private context: vscode.ExtensionContext;
+ private _state: vscode.Memento;
+ private _cookie: string;
+ private _userStatus: UserDataType;
+
+ public initialize(context: vscode.ExtensionContext): void {
+ this.context = context;
+ this._state = this.context.globalState;
+ }
+
+ public setCookie(cookie: string): any {
+ this._cookie = cookie;
+ return this._state.update(CookieKey, this._cookie);
+ }
+ public getCookie(): string | undefined {
+ return this._cookie ?? this._state.get(CookieKey);
+ }
+
+ public setUserStatus(userStatus: UserDataType): any {
+ this._userStatus = userStatus;
+ return this._state.update(UserStatusKey, this._userStatus);
+ }
+
+ public getUserStatus(): UserDataType | undefined {
+ return this._userStatus ?? this._state.get(UserStatusKey);
+ }
+
+ public removeCookie(): void {
+ this._state.update(CookieKey, undefined);
+ }
+
+ public removeAll(): void {
+ this._state.update(CookieKey, undefined);
+ this._state.update(UserStatusKey, undefined);
+ }
+}
+
+export const globalState: GlobalState = new GlobalState();
diff --git a/src/leetCodeExecutor.ts b/src/leetCodeExecutor.ts
index 8bef00fa..d2332c7a 100644
--- a/src/leetCodeExecutor.ts
+++ b/src/leetCodeExecutor.ts
@@ -3,25 +3,24 @@
import * as cp from "child_process";
import * as fse from "fs-extra";
+import * as os from "os";
import * as path from "path";
import * as requireFromString from "require-from-string";
+import { ExtensionContext } from "vscode";
import { ConfigurationChangeEvent, Disposable, MessageItem, window, workspace, WorkspaceConfiguration } from "vscode";
-import { Endpoint, IProblem, supportedPlugins } from "./shared";
+import { Endpoint, IProblem, leetcodeHasInited, supportedPlugins } from "./shared";
import { executeCommand, executeCommandWithProgress } from "./utils/cpUtils";
-import { genFileName } from "./utils/problemUtils";
import { DialogOptions, openUrl } from "./utils/uiUtils";
import * as wsl from "./utils/wslUtils";
import { toWslPath, useWsl } from "./utils/wslUtils";
class LeetCodeExecutor implements Disposable {
private leetCodeRootPath: string;
- private leetCodeRootPathInWsl: string;
private nodeExecutable: string;
private configurationChangeListener: Disposable;
constructor() {
this.leetCodeRootPath = path.join(__dirname, "..", "..", "node_modules", "vsc-leetcode-cli");
- this.leetCodeRootPathInWsl = "";
this.nodeExecutable = this.getNodePath();
this.configurationChangeListener = workspace.onDidChangeConfiguration((event: ConfigurationChangeEvent) => {
if (event.affectsConfiguration("leetcode.nodePath")) {
@@ -30,21 +29,18 @@ class LeetCodeExecutor implements Disposable {
}, this);
}
- public async getLeetCodeRootPath(): Promise { // not wrapped by ""
+ public async getLeetCodeBinaryPath(): Promise {
if (wsl.useWsl()) {
- if (!this.leetCodeRootPathInWsl) {
- this.leetCodeRootPathInWsl = `${await wsl.toWslPath(this.leetCodeRootPath)}`;
- }
- return `${this.leetCodeRootPathInWsl}`;
+ return `${await wsl.toWslPath(`"${path.join(this.leetCodeRootPath, "bin", "leetcode")}"`)}`;
}
- return `${this.leetCodeRootPath}`;
- }
-
- public async getLeetCodeBinaryPath(): Promise { // wrapped by ""
- return `"${path.join(await this.getLeetCodeRootPath(), "bin", "leetcode")}"`;
+ return `"${path.join(this.leetCodeRootPath, "bin", "leetcode")}"`;
}
- public async meetRequirements(): Promise {
+ public async meetRequirements(context: ExtensionContext): Promise {
+ const hasInited: boolean | undefined = context.globalState.get(leetcodeHasInited);
+ if (!hasInited) {
+ await this.removeOldCache();
+ }
if (this.nodeExecutable !== "node") {
if (!await fse.pathExists(this.nodeExecutable)) {
throw new Error(`The Node.js executable does not exist on path ${this.nodeExecutable}`);
@@ -70,10 +66,13 @@ class LeetCodeExecutor implements Disposable {
for (const plugin of supportedPlugins) {
try { // Check plugin
await this.executeCommandEx(this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "plugin", "-e", plugin]);
- } catch (error) { // Download plugin and activate
+ } catch (error) { // Remove old cache that may cause the error download plugin and activate
+ await this.removeOldCache();
await this.executeCommandEx(this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "plugin", "-i", plugin]);
}
}
+ // Set the global state HasInited true to skip delete old cache after init
+ context.globalState.update(leetcodeHasInited, true);
return true;
}
@@ -86,36 +85,65 @@ class LeetCodeExecutor implements Disposable {
}
public async signOut(): Promise {
- return await await this.executeCommandEx(this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "user", "-L"]);
+ return await this.executeCommandEx(this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "user", "-L"]);
}
- public async listProblems(showLocked: boolean): Promise {
- return await this.executeCommandEx(this.nodeExecutable, showLocked ?
- [await this.getLeetCodeBinaryPath(), "list"] :
- [await this.getLeetCodeBinaryPath(), "list", "-q", "L"],
- );
+ public async listProblems(showLocked: boolean, needTranslation: boolean): Promise {
+ const cmd: string[] = [await this.getLeetCodeBinaryPath(), "list"];
+ if (!needTranslation) {
+ cmd.push("-T"); // use -T to prevent translation
+ }
+ if (!showLocked) {
+ cmd.push("-q");
+ cmd.push("L");
+ }
+ return await this.executeCommandEx(this.nodeExecutable, cmd);
}
- public async showProblem(problemNode: IProblem, language: string, outDir: string, detailed: boolean = false): Promise {
- const fileName: string = genFileName(problemNode, language);
- const filePath: string = path.join(outDir, fileName);
- const templateType: string = detailed ? "-cx" : "-c";
+ public async showProblem(problemNode: IProblem, language: string, filePath: string, showDescriptionInComment: boolean = false, needTranslation: boolean): Promise {
+ const templateType: string = showDescriptionInComment ? "-cx" : "-c";
+ const cmd: string[] = [await this.getLeetCodeBinaryPath(), "show", problemNode.id, templateType, "-l", language];
+
+ if (!needTranslation) {
+ cmd.push("-T"); // use -T to force English version
+ }
if (!await fse.pathExists(filePath)) {
- const codeTemplate: string = await this.executeCommandWithProgressEx("Fetching problem data...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "show", problemNode.id, templateType, "-l", language]);
+ await fse.createFile(filePath);
+ const codeTemplate: string = await this.executeCommandWithProgressEx("Fetching problem data...", this.nodeExecutable, cmd);
await fse.writeFile(filePath, codeTemplate);
}
-
- return filePath;
}
- public async showSolution(input: string, language: string): Promise {
- const solution: string = await this.executeCommandWithProgressEx("Fetching top voted solution from discussions...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "show", input, "--solution", "-l", language]);
+ /**
+ * This function returns solution of a problem identified by input
+ *
+ * @remarks
+ * Even though this function takes the needTranslation flag, it is important to note
+ * that as of vsc-leetcode-cli 2.8.0, leetcode-cli doesn't support querying solution
+ * on CN endpoint yet. So this flag doesn't have any effect right now.
+ *
+ * @param input - parameter to pass to cli that can identify a problem
+ * @param language - the source code language of the solution desired
+ * @param needTranslation - whether or not to use endPoint translation on solution query
+ * @returns promise of the solution string
+ */
+ public async showSolution(input: string, language: string, needTranslation: boolean): Promise {
+ // solution don't support translation
+ const cmd: string[] = [await this.getLeetCodeBinaryPath(), "show", input, "--solution", "-l", language];
+ if (!needTranslation) {
+ cmd.push("-T");
+ }
+ const solution: string = await this.executeCommandWithProgressEx("Fetching top voted solution from discussions...", this.nodeExecutable, cmd);
return solution;
}
- public async getDescription(problemNodeId: string): Promise {
- return await this.executeCommandWithProgressEx("Fetching problem description...", this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "show", problemNodeId, "-x"]);
+ public async getDescription(problemNodeId: string, needTranslation: boolean): Promise {
+ const cmd: string[] = [await this.getLeetCodeBinaryPath(), "show", problemNodeId, "-x"];
+ if (!needTranslation) {
+ cmd.push("-T");
+ }
+ return await this.executeCommandWithProgressEx("Fetching problem description...", this.nodeExecutable, cmd);
}
public async listSessions(): Promise {
@@ -162,9 +190,17 @@ class LeetCodeExecutor implements Disposable {
}
}
+ public async toggleFavorite(node: IProblem, addToFavorite: boolean): Promise {
+ const commandParams: string[] = [await this.getLeetCodeBinaryPath(), "star", node.id];
+ if (!addToFavorite) {
+ commandParams.push("-d");
+ }
+ await this.executeCommandWithProgressEx("Updating the favorite list...", "node", commandParams);
+ }
+
public async getCompaniesAndTags(): Promise<{ companies: { [key: string]: string[] }, tags: { [key: string]: string[] } }> {
// preprocess the plugin source
- const companiesTagsPath: string = path.join(await leetCodeExecutor.getLeetCodeRootPath(), "lib", "plugins", "company.js");
+ const companiesTagsPath: string = path.join(this.leetCodeRootPath, "lib", "plugins", "company.js");
const companiesTagsSrc: string = (await fse.readFile(companiesTagsPath, "utf8")).replace(
"module.exports = plugin",
"module.exports = { COMPONIES, TAGS }",
@@ -199,6 +235,14 @@ class LeetCodeExecutor implements Disposable {
}
return await executeCommandWithProgress(message, command, args, options);
}
+
+ private async removeOldCache(): Promise {
+ const oldPath: string = path.join(os.homedir(), ".lc");
+ if (await fse.pathExists(oldPath)) {
+ await fse.remove(oldPath);
+ }
+ }
+
}
export const leetCodeExecutor: LeetCodeExecutor = new LeetCodeExecutor();
diff --git a/src/leetCodeManager.ts b/src/leetCodeManager.ts
index 96e3c0b0..16ec3782 100644
--- a/src/leetCodeManager.ts
+++ b/src/leetCodeManager.ts
@@ -6,19 +6,26 @@ import { EventEmitter } from "events";
import * as vscode from "vscode";
import { leetCodeChannel } from "./leetCodeChannel";
import { leetCodeExecutor } from "./leetCodeExecutor";
-import { UserStatus } from "./shared";
+import { Endpoint, IQuickItemEx, loginArgsMapping, urls, urlsCn, UserStatus } from "./shared";
import { createEnvOption } from "./utils/cpUtils";
-import { DialogType, promptForOpenOutputChannel } from "./utils/uiUtils";
+import { DialogType, openUrl, promptForOpenOutputChannel } from "./utils/uiUtils";
import * as wsl from "./utils/wslUtils";
+import { getLeetCodeEndpoint } from "./commands/plugin";
+import { globalState } from "./globalState";
+import { queryUserData } from "./request/query-user-data";
+import { parseQuery } from "./utils/toolUtils";
class LeetCodeManager extends EventEmitter {
private currentUser: string | undefined;
private userStatus: UserStatus;
+ private readonly successRegex: RegExp = /(?:.*)Successfully .*login as (.*)/i;
+ private readonly failRegex: RegExp = /.*\[ERROR\].*/i;
constructor() {
super();
this.currentUser = undefined;
this.userStatus = UserStatus.SignedOut;
+ this.handleUriSignIn = this.handleUriSignIn.bind(this);
}
public async getLoginStatus(): Promise {
@@ -29,73 +36,90 @@ class LeetCodeManager extends EventEmitter {
} catch (error) {
this.currentUser = undefined;
this.userStatus = UserStatus.SignedOut;
+ globalState.removeAll();
} finally {
this.emit("statusChanged");
}
}
- public async signIn(): Promise {
+ private async updateUserStatusWithCookie(cookie: string): Promise {
+ globalState.setCookie(cookie);
+ const data = await queryUserData();
+ globalState.setUserStatus(data);
+ await this.setCookieToCli(cookie, data.username);
+ if (data.username) {
+ vscode.window.showInformationMessage(`Successfully ${data.username}.`);
+ this.currentUser = data.username;
+ this.userStatus = UserStatus.SignedIn;
+ this.emit("statusChanged");
+ }
+ }
+
+ public async handleUriSignIn(uri: vscode.Uri): Promise {
try {
- const userName: string | undefined = await new Promise(async (resolve: (res: string | undefined) => void, reject: (e: Error) => void): Promise => {
- let result: string = "";
-
- const leetCodeBinaryPath: string = await leetCodeExecutor.getLeetCodeBinaryPath();
-
- const childProc: cp.ChildProcess = wsl.useWsl()
- ? cp.spawn("wsl", [leetCodeExecutor.node, leetCodeBinaryPath, "user", "-l"], { shell: true })
- : cp.spawn(leetCodeExecutor.node, [leetCodeBinaryPath, "user", "-l"], {
- shell: true,
- env: createEnvOption(),
- });
-
- childProc.stdout.on("data", (data: string | Buffer) => {
- data = data.toString();
- result = result.concat(data);
- leetCodeChannel.append(data);
- });
-
- childProc.stderr.on("data", (data: string | Buffer) => leetCodeChannel.append(data.toString()));
-
- childProc.on("error", reject);
- const name: string | undefined = await vscode.window.showInputBox({
- prompt: "Enter username or E-mail.",
- validateInput: (s: string): string | undefined => s && s.trim() ? undefined : "The input must not be empty",
- });
- if (!name) {
- childProc.kill();
- return resolve(undefined);
- }
- childProc.stdin.write(`${name}\n`);
- const pwd: string | undefined = await vscode.window.showInputBox({
- prompt: "Enter password.",
- password: true,
- validateInput: (s: string): string | undefined => s ? undefined : "Password must not be empty",
- });
- if (!pwd) {
- childProc.kill();
- return resolve(undefined);
+ await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification }, async (progress: vscode.Progress<{}>) => {
+ progress.report({ message: "Fetching user data..." });
+ const queryParams = parseQuery(uri.query);
+ const cookie = queryParams["cookie"];
+ if (!cookie) {
+ promptForOpenOutputChannel(`Failed to get cookie. Please log in again`, DialogType.error);
+ return;
}
- childProc.stdin.write(`${pwd}\n`);
- childProc.stdin.end();
- childProc.on("close", () => {
- const match: RegExpMatchArray | null = result.match(/(?:.*) Successfully login as (.*)/i);
- if (match && match[1]) {
- resolve(match[1]);
- } else {
- reject(new Error("Failed to sign in."));
- }
- });
+
+ await this.updateUserStatusWithCookie(cookie)
+
});
- if (userName) {
- vscode.window.showInformationMessage("Successfully signed in.");
- this.currentUser = userName;
- this.userStatus = UserStatus.SignedIn;
- this.emit("statusChanged");
- }
} catch (error) {
- promptForOpenOutputChannel("Failed to sign in. Please open the output channel for details", DialogType.error);
+ promptForOpenOutputChannel(`Failed to log in. Please open the output channel for details`, DialogType.error);
+ }
+ }
+
+ public async handleInputCookieSignIn(): Promise {
+ const cookie: string | undefined = await vscode.window.showInputBox({
+ prompt: 'Enter LeetCode Cookie',
+ password: true,
+ ignoreFocusOut: true,
+ validateInput: (s: string): string | undefined =>
+ s ? undefined : 'Cookie must not be empty',
+ })
+
+ await this.updateUserStatusWithCookie(cookie || '')
+ }
+
+ public async signIn(): Promise {
+ const picks: Array> = []
+ picks.push(
+ {
+ label: 'Web Authorization',
+ detail: 'Open browser to authorize login on the website',
+ value: 'WebAuth',
+ description: '[Recommended]'
+ },
+ {
+ label: 'LeetCode Cookie',
+ detail: 'Use LeetCode cookie copied from browser to login',
+ value: 'Cookie',
+ }
+ )
+
+ const choice: IQuickItemEx | undefined = await vscode.window.showQuickPick(picks)
+ if (!choice) {
+ return
}
+ const loginMethod: string = choice.value
+ if (loginMethod === 'WebAuth') {
+ openUrl(this.getAuthLoginUrl())
+ return
+ }
+
+ try {
+ await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, title: "Fetching user data..." }, async () => {
+ await this.handleInputCookieSignIn()
+ });
+ } catch (error) {
+ promptForOpenOutputChannel(`Failed to log in. Please open the output channel for details`, DialogType.error);
+ }
}
public async signOut(): Promise {
@@ -104,6 +128,7 @@ class LeetCodeManager extends EventEmitter {
vscode.window.showInformationMessage("Successfully signed out.");
this.currentUser = undefined;
this.userStatus = UserStatus.SignedOut;
+ globalState.removeAll();
this.emit("statusChanged");
} catch (error) {
// swallow the error when sign out.
@@ -127,6 +152,52 @@ class LeetCodeManager extends EventEmitter {
return "Unknown";
}
+
+ public getAuthLoginUrl(): string {
+ switch (getLeetCodeEndpoint()) {
+ case Endpoint.LeetCodeCN:
+ return urlsCn.authLoginUrl;
+ case Endpoint.LeetCode:
+ default:
+ return urls.authLoginUrl;
+ }
+ }
+
+ public setCookieToCli(cookie: string, name: string): Promise {
+ return new Promise(async (resolve: (res: void) => void, reject: (e: Error) => void) => {
+ const leetCodeBinaryPath: string = await leetCodeExecutor.getLeetCodeBinaryPath();
+
+ const childProc: cp.ChildProcess = wsl.useWsl()
+ ? cp.spawn("wsl", [leetCodeExecutor.node, leetCodeBinaryPath, "user", loginArgsMapping.get("Cookie") ?? ""], {
+ shell: true,
+ })
+ : cp.spawn(leetCodeExecutor.node, [leetCodeBinaryPath, "user", loginArgsMapping.get("Cookie") ?? ""], {
+ shell: true,
+ env: createEnvOption(),
+ });
+
+ childProc.stdout?.on("data", async (data: string | Buffer) => {
+ data = data.toString();
+ leetCodeChannel.append(data);
+ const successMatch: RegExpMatchArray | null = data.match(this.successRegex);
+ if (successMatch && successMatch[1]) {
+ childProc.stdin?.end();
+ return resolve();
+ } else if (data.match(this.failRegex)) {
+ childProc.stdin?.end();
+ return reject(new Error("Faile to login"));
+ } else if (data.match(/login: /)) {
+ childProc.stdin?.write(`${name}\n`);
+ } else if (data.match(/cookie: /)) {
+ childProc.stdin?.write(`${cookie}\n`);
+ }
+ });
+
+ childProc.stderr?.on("data", (data: string | Buffer) => leetCodeChannel.append(data.toString()));
+
+ childProc.on("error", reject);
+ });
+ }
}
export const leetCodeManager: LeetCodeManager = new LeetCodeManager();
diff --git a/src/request/query-user-data.ts b/src/request/query-user-data.ts
new file mode 100644
index 00000000..ffcca1e1
--- /dev/null
+++ b/src/request/query-user-data.ts
@@ -0,0 +1,25 @@
+import { UserDataType } from "../globalState";
+import { getUrl } from "../shared";
+import { LcAxios } from "../utils/httpUtils";
+
+const graphqlStr = `
+ query globalData {
+ userStatus {
+ isPremium
+ isVerified
+ username
+ avatar
+ isSignedIn
+ }
+ }
+`;
+
+export const queryUserData = async (): Promise => {
+ return LcAxios(getUrl("userGraphql"), {
+ method: "POST",
+ data: {
+ query: graphqlStr,
+ variables: {},
+ },
+ }).then((res) => res.data.data.userStatus);
+};
diff --git a/src/shared.ts b/src/shared.ts
index 78518454..e8b59d89 100644
--- a/src/shared.ts
+++ b/src/shared.ts
@@ -12,6 +12,13 @@ export enum UserStatus {
SignedOut = 2,
}
+export const loginArgsMapping: Map = new Map([
+ ["LeetCode", "-l"],
+ ["Cookie", "-c"],
+ ["GitHub", "-g"],
+ ["LinkedIn", "-i"],
+]);
+
export const languages: string[] = [
"bash",
"c",
@@ -29,6 +36,7 @@ export const languages: string[] = [
"rust",
"scala",
"swift",
+ "typescript",
];
export const langExt: Map = new Map([
@@ -48,12 +56,14 @@ export const langExt: Map = new Map([
["rust", "rs"],
["scala", "scala"],
["swift", "swift"],
+ ["typescript", "ts"],
]);
export enum ProblemState {
AC = 1,
NotAC = 2,
Unknown = 3,
+ Locked = 4,
}
export enum Endpoint {
@@ -93,8 +103,56 @@ export enum Category {
Favorite = "Favorite",
}
-export const supportedPlugins: string[] = [
- "company",
- "solution.discuss",
- "leetcode.cn",
-];
+export const supportedPlugins: string[] = ["company", "solution.discuss", "leetcode.cn"];
+
+export enum DescriptionConfiguration {
+ InWebView = "In Webview",
+ InFileComment = "In File Comment",
+ Both = "Both",
+ None = "None",
+}
+
+export const leetcodeHasInited: string = "leetcode.hasInited";
+
+export enum SortingStrategy {
+ None = "None",
+ AcceptanceRateAsc = "Acceptance Rate (Ascending)",
+ AcceptanceRateDesc = "Acceptance Rate (Descending)",
+ FrequencyAsc = "Frequency (Ascending)",
+ FrequencyDesc = "Frequency (Descending)",
+}
+
+export const PREMIUM_URL_CN = "https://leetcode.cn/premium-payment/?source=vscode";
+export const PREMIUM_URL_GLOBAL = "https://leetcode.com/subscribe/?ref=lp_pl&source=vscode";
+
+const protocol = vscode.env.appName.includes('Insiders') ? "vscode-insiders" : "vscode"
+
+export const urls = {
+ // base urls
+ base: "https://leetcode.com/",
+ graphql: "https://leetcode.com/graphql",
+ userGraphql: "https://leetcode.com/graphql",
+ login: "https://leetcode.com/accounts/login/",
+ authLoginUrl: `https://leetcode.com/authorize-login/${protocol}/?path=leetcode.vscode-leetcode`,
+};
+
+export const urlsCn = {
+ // base urls
+ base: "https://leetcode.cn/",
+ graphql: "https://leetcode.cn/graphql",
+ userGraphql: "https://leetcode.cn/graphql/",
+ login: "https://leetcode.cn/accounts/login/",
+ authLoginUrl: `https://leetcode.cn/authorize-login/${protocol}/?path=leetcode.vscode-leetcode`,
+};
+
+export const getUrl = (key: string) => {
+ const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
+ const point = leetCodeConfig.get("endpoint", Endpoint.LeetCode);
+ switch (point) {
+ case Endpoint.LeetCodeCN:
+ return urlsCn[key];
+ case Endpoint.LeetCode:
+ default:
+ return urls[key];
+ }
+};
diff --git a/src/utils/cpUtils.ts b/src/utils/cpUtils.ts
index 59e907b6..c71ae61c 100644
--- a/src/utils/cpUtils.ts
+++ b/src/utils/cpUtils.ts
@@ -15,13 +15,13 @@ export async function executeCommand(command: string, args: string[], options: c
const childProc: cp.ChildProcess = cp.spawn(command, args, { ...options, env: createEnvOption() });
- childProc.stdout.on("data", (data: string | Buffer) => {
+ childProc.stdout?.on("data", (data: string | Buffer) => {
data = data.toString();
result = result.concat(data);
leetCodeChannel.append(data);
});
- childProc.stderr.on("data", (data: string | Buffer) => leetCodeChannel.append(data.toString()));
+ childProc.stderr?.on("data", (data: string | Buffer) => leetCodeChannel.append(data.toString()));
childProc.on("error", reject);
@@ -42,7 +42,7 @@ export async function executeCommand(command: string, args: string[], options: c
export async function executeCommandWithProgress(message: string, command: string, args: string[], options: cp.SpawnOptions = { shell: true }): Promise {
let result: string = "";
await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification }, async (p: vscode.Progress<{}>) => {
- return new Promise(async (resolve: () => void, reject: (e: Error) => void): Promise => {
+ return new Promise(async (resolve: () => void, reject: (e: Error) => void): Promise => {
p.report({ message });
try {
result = await executeCommand(command, args, options);
diff --git a/src/utils/httpUtils.ts b/src/utils/httpUtils.ts
new file mode 100644
index 00000000..b7771734
--- /dev/null
+++ b/src/utils/httpUtils.ts
@@ -0,0 +1,28 @@
+import axios, { AxiosRequestConfig, AxiosPromise } from "axios";
+import { omit } from "lodash";
+import { globalState } from "../globalState";
+import { DialogType, promptForOpenOutputChannel } from "./uiUtils";
+
+const referer = "vscode-lc-extension";
+
+export function LcAxios(path: string, settings?: AxiosRequestConfig): AxiosPromise {
+ const cookie = globalState.getCookie();
+ if (!cookie) {
+ promptForOpenOutputChannel(
+ `Failed to obtain the cookie. Please log in again.`,
+ DialogType.error
+ );
+ return Promise.reject("Failed to obtain the cookie.");
+ }
+ return axios(path, {
+ headers: {
+ referer,
+ "content-type": "application/json",
+ cookie,
+ ...(settings && settings.headers),
+ },
+ xsrfCookieName: "csrftoken",
+ xsrfHeaderName: "X-CSRFToken",
+ ...(settings && omit(settings, "headers")),
+ });
+}
diff --git a/src/utils/settingUtils.ts b/src/utils/settingUtils.ts
index 388f31b8..7b6eb6c2 100644
--- a/src/utils/settingUtils.ts
+++ b/src/utils/settingUtils.ts
@@ -2,6 +2,7 @@
// Licensed under the MIT license.
import { workspace, WorkspaceConfiguration } from "vscode";
+import { DescriptionConfiguration } from "../shared";
export function getWorkspaceConfiguration(): WorkspaceConfiguration {
return workspace.getConfiguration("leetcode");
@@ -18,3 +19,50 @@ export function getWorkspaceFolder(): string {
export function getEditorShortcuts(): string[] {
return getWorkspaceConfiguration().get("editor.shortcuts", ["submit", "test"]);
}
+
+export function hasStarShortcut(): boolean {
+ const shortcuts: string[] = getWorkspaceConfiguration().get("editor.shortcuts", ["submit", "test"]);
+ return shortcuts.indexOf("star") >= 0;
+}
+
+export function shouldUseEndpointTranslation(): boolean {
+ return getWorkspaceConfiguration().get("useEndpointTranslation", true);
+}
+
+export function getDescriptionConfiguration(): IDescriptionConfiguration {
+ const setting: string = getWorkspaceConfiguration().get("showDescription", DescriptionConfiguration.InWebView);
+ const config: IDescriptionConfiguration = {
+ showInComment: false,
+ showInWebview: true,
+ };
+ switch (setting) {
+ case DescriptionConfiguration.Both:
+ config.showInComment = true;
+ config.showInWebview = true;
+ break;
+ case DescriptionConfiguration.None:
+ config.showInComment = false;
+ config.showInWebview = false;
+ break;
+ case DescriptionConfiguration.InFileComment:
+ config.showInComment = true;
+ config.showInWebview = false;
+ break;
+ case DescriptionConfiguration.InWebView:
+ config.showInComment = false;
+ config.showInWebview = true;
+ break;
+ }
+
+ // To be compatible with the deprecated setting:
+ if (getWorkspaceConfiguration().get("showCommentDescription")) {
+ config.showInComment = true;
+ }
+
+ return config;
+}
+
+export interface IDescriptionConfiguration {
+ showInComment: boolean;
+ showInWebview: boolean;
+}
diff --git a/src/utils/toolUtils.ts b/src/utils/toolUtils.ts
new file mode 100644
index 00000000..ce37e185
--- /dev/null
+++ b/src/utils/toolUtils.ts
@@ -0,0 +1,26 @@
+export function sleep(ms) {
+ return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+export function parseQuery(query: string): { [key: string]: string } {
+ const queryObject: { [key: string]: string } = {};
+
+ if (!query) {
+ return queryObject;
+ }
+
+ const keyValuePairs = query.split("&");
+ keyValuePairs.forEach((pair) => {
+ const firstEqualsIndex = pair.indexOf("=");
+ if (firstEqualsIndex !== -1) {
+ const key = pair.substring(0, firstEqualsIndex);
+ const value = pair.substring(firstEqualsIndex + 1);
+ queryObject[decodeURIComponent(key)] = decodeURIComponent(value);
+ } else {
+ // If no equals sign is found, treat the whole string as key with empty value
+ queryObject[decodeURIComponent(pair)] = "";
+ }
+ });
+
+ return queryObject;
+}
diff --git a/src/utils/trackingUtils.ts b/src/utils/trackingUtils.ts
new file mode 100644
index 00000000..56b1a6fb
--- /dev/null
+++ b/src/utils/trackingUtils.ts
@@ -0,0 +1,130 @@
+import * as vscode from "vscode";
+import axios from "axios";
+import { getLeetCodeEndpoint } from "../commands/plugin";
+import { Endpoint } from "../shared";
+import { leetCodeManager } from "../leetCodeManager";
+
+const getTimeZone = (): string => {
+ const endPoint: string = getLeetCodeEndpoint();
+ if (endPoint === Endpoint.LeetCodeCN) {
+ return "Asia/Shanghai";
+ } else {
+ return "UTC";
+ }
+};
+
+interface IReportData {
+ event_key: string;
+ type?: "click" | "expose" | string;
+ anonymous_id?: string;
+ tid?: number;
+ ename?: string; // event name
+ href?: string;
+ referer?: string;
+ extra?: string;
+ target?: string;
+}
+
+interface ITrackData {
+ reportCache: IReportData[];
+ isSubmit: boolean;
+ report: (reportItems: IReportData | IReportData[]) => void;
+ submitReport: (useSendBeason: boolean) => Promise;
+ reportUrl: string;
+}
+
+const testReportUrl = "https://analysis.lingkou.xyz/i/event";
+const prodReportUrl = "https://analysis.leetcode.cn/i/event";
+
+function getReportUrl() {
+ if (process.env.NODE_ENV === "production") {
+ return prodReportUrl;
+ } else {
+ return testReportUrl;
+ }
+}
+
+const _charStr = "abacdefghjklmnopqrstuvwxyzABCDEFGHJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()_+=";
+
+function RandomIndex(min: number, max: number, i: number) {
+ let index = Math.floor(Math.random() * (max - min + 1) + min);
+ const numStart = _charStr.length - 10;
+ if (i === 0 && index >= numStart) {
+ index = RandomIndex(min, max, i);
+ }
+ return index;
+}
+
+function getRandomString(len: number) {
+ const min = 0;
+ const max = _charStr.length - 1;
+ let _str = "";
+ len = len || 15;
+ for (let i = 0, index; i < len; i++) {
+ index = RandomIndex(min, max, i);
+ _str += _charStr[index];
+ }
+ return _str;
+}
+
+function getAllowReportDataConfig() {
+ const leetCodeConfig = vscode.workspace.getConfiguration("leetcode");
+ const allowReportData = !!leetCodeConfig.get("allowReportData");
+ return allowReportData;
+}
+
+class TrackData implements ITrackData {
+ public reportCache: IReportData[] = [];
+
+ public isSubmit: boolean = false;
+
+ public reportUrl: string = getReportUrl();
+
+ private sendTimer: NodeJS.Timeout | undefined;
+
+ public report = (reportItems: IReportData | IReportData[]) => {
+ if (!getAllowReportDataConfig()) return;
+
+ this.sendTimer && clearTimeout(this.sendTimer);
+
+ if (!Array.isArray(reportItems)) {
+ reportItems = [reportItems];
+ }
+ const randomId = getRandomString(60);
+ reportItems.forEach((item) => {
+ this.reportCache.push({
+ ...item,
+ referer: "vscode",
+ target: leetCodeManager.getUser() ?? "",
+ anonymous_id: item.anonymous_id ?? (randomId as string),
+ });
+ });
+ this.sendTimer = setTimeout(this.submitReport, 800);
+ };
+
+ public submitReport = async () => {
+ if (!getAllowReportDataConfig()) return;
+ const dataList = JSON.stringify(this.reportCache);
+
+ if (!this.reportCache.length || this.isSubmit) {
+ return;
+ }
+ this.reportCache = [];
+ try {
+ this.isSubmit = true;
+ axios.defaults.withCredentials = true;
+ await axios.post(this.reportUrl, `dataList=${encodeURIComponent(dataList)}`, {
+ headers: {
+ "Content-Type": "application/x-www-form-urlencoded",
+ "x-timezone": getTimeZone(),
+ },
+ });
+ } catch (e) {
+ this.reportCache = this.reportCache.concat(JSON.parse(dataList));
+ } finally {
+ this.isSubmit = false;
+ }
+ };
+}
+
+export default new TrackData();
diff --git a/src/utils/uiUtils.ts b/src/utils/uiUtils.ts
index 037b2371..9e251a55 100644
--- a/src/utils/uiUtils.ts
+++ b/src/utils/uiUtils.ts
@@ -48,7 +48,7 @@ export async function promptForSignIn(): Promise {
break;
case DialogOptions.singUp:
if (getLeetCodeEndpoint()) {
- openUrl("https://leetcode-cn.com/");
+ openUrl("https://leetcode.cn/");
} else {
openUrl("https://leetcode.com/");
}
@@ -80,8 +80,8 @@ export async function openKeybindingsEditor(query?: string): Promise {
await vscode.commands.executeCommand("workbench.action.openGlobalKeybindings", query);
}
-export async function showFileSelectDialog(): Promise {
- const defaultUri: vscode.Uri | undefined = vscode.workspace.rootPath ? vscode.Uri.file(vscode.workspace.rootPath) : undefined;
+export async function showFileSelectDialog(fsPath?: string): Promise {
+ const defaultUri: vscode.Uri | undefined = getBelongingWorkspaceFolderUri(fsPath);
const options: vscode.OpenDialogOptions = {
defaultUri,
canSelectFiles: true,
@@ -92,8 +92,19 @@ export async function showFileSelectDialog(): Promise
return await vscode.window.showOpenDialog(options);
}
-export async function showDirectorySelectDialog(): Promise {
- const defaultUri: vscode.Uri | undefined = vscode.workspace.rootPath ? vscode.Uri.file(vscode.workspace.rootPath) : undefined;
+function getBelongingWorkspaceFolderUri(fsPath: string | undefined): vscode.Uri | undefined {
+ let defaultUri: vscode.Uri | undefined;
+ if (fsPath) {
+ const workspaceFolder: vscode.WorkspaceFolder | undefined = vscode.workspace.getWorkspaceFolder(vscode.Uri.file(fsPath));
+ if (workspaceFolder) {
+ defaultUri = workspaceFolder.uri;
+ }
+ }
+ return defaultUri;
+}
+
+export async function showDirectorySelectDialog(fsPath?: string): Promise {
+ const defaultUri: vscode.Uri | undefined = getBelongingWorkspaceFolderUri(fsPath);
const options: vscode.OpenDialogOptions = {
defaultUri,
canSelectFiles: false,
diff --git a/src/utils/workspaceUtils.ts b/src/utils/workspaceUtils.ts
index b77fc3c7..48105d5a 100644
--- a/src/utils/workspaceUtils.ts
+++ b/src/utils/workspaceUtils.ts
@@ -1,6 +1,7 @@
// Copyright (c) jdneo. All rights reserved.
// Licensed under the MIT license.
+import * as fse from "fs-extra";
import * as os from "os";
import * as path from "path";
import * as vscode from "vscode";
@@ -18,9 +19,9 @@ export async function selectWorkspaceFolder(): Promise {
return workspaceFolderSetting;
}
}
- const workspaceFolders: vscode.WorkspaceFolder[] = vscode.workspace.workspaceFolders || [];
let needAsk: boolean = true;
- for (const folder of workspaceFolders) {
+ await fse.ensureDir(workspaceFolderSetting);
+ for (const folder of vscode.workspace.workspaceFolders || []) {
if (isSubFolder(folder.uri.fsPath, workspaceFolderSetting)) {
needAsk = false;
}
@@ -29,14 +30,18 @@ export async function selectWorkspaceFolder(): Promise {
if (needAsk) {
const choice: string | undefined = await vscode.window.showQuickPick(
[
+ OpenOption.justOpenFile,
OpenOption.openInCurrentWindow,
OpenOption.openInNewWindow,
OpenOption.addToWorkspace,
],
- { placeHolder: "Select how you would like to open your workspace folder" },
+ { placeHolder: "The LeetCode workspace folder is not opened in VS Code, would you like to open it?" },
);
+ // Todo: generate file first
switch (choice) {
+ case OpenOption.justOpenFile:
+ return workspaceFolderSetting;
case OpenOption.openInCurrentWindow:
await vscode.commands.executeCommand("vscode.openFolder", vscode.Uri.file(workspaceFolderSetting), false);
return "";
@@ -44,7 +49,7 @@ export async function selectWorkspaceFolder(): Promise {
await vscode.commands.executeCommand("vscode.openFolder", vscode.Uri.file(workspaceFolderSetting), true);
return "";
case OpenOption.addToWorkspace:
- vscode.workspace.updateWorkspaceFolders(workspaceFolders.length, 0, { uri: vscode.Uri.file(workspaceFolderSetting) });
+ vscode.workspace.updateWorkspaceFolders(vscode.workspace.workspaceFolders?.length ?? 0, 0, { uri: vscode.Uri.file(workspaceFolderSetting) });
break;
default:
return "";
@@ -117,6 +122,7 @@ async function determineLeetCodeFolder(): Promise {
}
enum OpenOption {
+ justOpenFile = "Just open the problem file",
openInCurrentWindow = "Open in current window",
openInNewWindow = "Open in new window",
addToWorkspace = "Add to workspace",
diff --git a/src/utils/wslUtils.ts b/src/utils/wslUtils.ts
index d496b038..16d83cde 100644
--- a/src/utils/wslUtils.ts
+++ b/src/utils/wslUtils.ts
@@ -15,5 +15,8 @@ export async function toWslPath(path: string): Promise {
}
export async function toWinPath(path: string): Promise {
- return (await executeCommand("wsl", ["wslpath", "-w", `"${path}"`])).trim();
+ if (path.startsWith("\\mnt\\")) {
+ return (await executeCommand("wsl", ["wslpath", "-w", `"${path.replace(/\\/g, "/").substr(0, 6)}"`])).trim() + path.substr(7);
+ }
+ return (await executeCommand("wsl", ["wslpath", "-w", "/"])).trim() + path;
}
diff --git a/src/webview/leetCodePreviewProvider.ts b/src/webview/leetCodePreviewProvider.ts
index 1bd83e69..86060de5 100644
--- a/src/webview/leetCodePreviewProvider.ts
+++ b/src/webview/leetCodePreviewProvider.ts
@@ -2,12 +2,12 @@
// Licensed under the MIT license.
import { commands, ViewColumn } from "vscode";
-import { IProblem } from "../shared";
+import { getLeetCodeEndpoint } from "../commands/plugin";
+import { Endpoint, IProblem } from "../shared";
import { ILeetCodeWebviewOption, LeetCodeWebview } from "./LeetCodeWebview";
import { markdownEngine } from "./markdownEngine";
class LeetCodePreviewProvider extends LeetCodeWebview {
-
protected readonly viewType: string = "leetcode.preview";
private node: IProblem;
private description: IDescription;
@@ -22,11 +22,6 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
this.node = node;
this.sideMode = isSideMode;
this.showWebviewInternal();
- // Comment out this operation since it sometimes may cause the webview become empty.
- // Waiting for the progress of the VS Code side issue: https://github.com/microsoft/vscode/issues/3742
- // if (this.sideMode) {
- // this.hideSideBar(); // For better view area
- // }
}
protected getWebviewOption(): ILeetCodeWebviewOption {
@@ -45,7 +40,7 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
}
protected getWebviewContent(): string {
- const button: { element: string, script: string, style: string } = {
+ const button: { element: string; script: string; style: string } = {
element: `Code Now `,
script: `const button = document.getElementById('solve');
button.onclick = () => vscode.postMessage({
@@ -72,35 +67,31 @@ class LeetCodePreviewProvider extends LeetCodeWebview {
};
const { title, url, category, difficulty, likes, dislikes, body } = this.description;
const head: string = markdownEngine.render(`# [${title}](${url})`);
- const info: string = markdownEngine.render([
- `| Category | Difficulty | Likes | Dislikes |`,
- `| :------: | :--------: | :---: | :------: |`,
- `| ${category} | ${difficulty} | ${likes} | ${dislikes} |`,
- ].join("\n"));
+ const info: string = markdownEngine.render(
+ [
+ `| Category | Difficulty | Likes | Dislikes |`,
+ `| :------: | :--------: | :---: | :------: |`,
+ `| ${category} | ${difficulty} | ${likes} | ${dislikes} |`,
+ ].join("\n")
+ );
const tags: string = [
``,
`Tags `,
].join("\n");
const companies: string = [
``,
`Companies `,
].join("\n");
+ const links: string = markdownEngine.render(`[Submissions](${this.getSubmissionsLink(url)}) | [Solution](${this.getSolutionsLink(url)})`);
return `
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 