diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 3bbcfd872b..ecb414216f 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -330,33 +330,6 @@ SOFTWARE. END OF bitinn/node-fetch NOTICES AND INFORMATION -%% axios/axios NOTICES AND INFORMATION BEGIN HERE -========================================= -The MIT License (MIT) - -Copyright (c) 2014-present Matt Zabriskie - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -========================================= -END OF axios/axios NOTICES AND INFORMATION - - %% stefanpenner/es6-promise NOTICES AND INFORMATION BEGIN HERE ========================================= Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors diff --git a/package.json b/package.json index e542e0f4e0..78a908dc27 100644 --- a/package.json +++ b/package.json @@ -555,7 +555,6 @@ "@octokit/rest": "^15.15.1", "apollo-boost": "^0.1.22", "apollo-link-context": "^1.0.12", - "axios": "^0.18.0", "debounce": "^1.2.0", "es6-promise": "^4.2.5", "git-credential-node": "^1.1.0", diff --git a/preview-src/comment.tsx b/preview-src/comment.tsx index 3d8f279ba8..03ba2a1a70 100644 --- a/preview-src/comment.tsx +++ b/preview-src/comment.tsx @@ -87,7 +87,6 @@ function CommentBox({ for: comment, onMouseEnter, onMouseLeave, children }: CommentBoxProps) { const { user, author, createdAt, htmlUrl } = comment; - console.log('comment=', comment) return
diff --git a/src/common/logger.ts b/src/common/logger.ts index 9954d398a7..8cd6a2a1a1 100644 --- a/src/common/logger.ts +++ b/src/common/logger.ts @@ -23,7 +23,7 @@ class Log { } public appendLine(message: string, component?: string) { - switch(this._logLevel) { + switch (this._logLevel) { case LogLevel.Off: return; case LogLevel.Debug: @@ -53,7 +53,7 @@ class Log { private getLogLevel() { let logLevel = vscode.workspace.getConfiguration(SETTINGS_NAMESPACE).get(LOG_LEVEL_SETTING); - switch(logLevel) { + switch (logLevel) { case 'debug': this._logLevel = LogLevel.Debug; break; diff --git a/src/common/utils.ts b/src/common/utils.ts index c524550316..ab8017e34c 100644 --- a/src/common/utils.ts +++ b/src/common/utils.ts @@ -166,7 +166,7 @@ export async function promiseFromEvent( try { Promise.resolve(adapter(value, resolve, reject)) .catch(reject); - } catch(error) { + } catch (error) { reject(error); } }) @@ -326,7 +326,6 @@ export class TernarySearchTree { node.left.segment = iter.value(); } node = node.left; - } else if (val < 0) { // right if (!node.right) { diff --git a/src/github/pullRequestManager.ts b/src/github/pullRequestManager.ts index bc9516d4e1..73d7429468 100644 --- a/src/github/pullRequestManager.ts +++ b/src/github/pullRequestManager.ts @@ -1503,7 +1503,7 @@ export class PullRequestManager { const author = matchingCommits[0].author; // There is not necessarily a GitHub account associated with the commit. if (author !== null) { - if(pullRequest.githubRepository.isGitHubDotCom) { + if (pullRequest.githubRepository.isGitHubDotCom) { commitEvent.author.avatarUrl = author.avatar_url; } diff --git a/src/github/utils.ts b/src/github/utils.ts index 1c7eae7449..3402006912 100644 --- a/src/github/utils.ts +++ b/src/github/utils.ts @@ -326,7 +326,7 @@ function parseAuthor(author: {login: string, url: string, avatarUrl: string}, gi login: author.login, url: author.url, avatarUrl: githubRepository.isGitHubDotCom ? author.avatarUrl : undefined - } + }; } export function parseGraphQLPullRequest(pullRequest: GraphQL.PullRequestResponse, githubRepository: GitHubRepository): PullRequest { diff --git a/tslint.json b/tslint.json index 786f0e10c0..449a74e789 100644 --- a/tslint.json +++ b/tslint.json @@ -25,6 +25,6 @@ "always" ], "triple-equals": true, - "whitespace": true + "whitespace": [true, "check-branch"] } } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index c02d74b216..acf593afd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -655,14 +655,6 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== -axios@^0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102" - integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI= - dependencies: - follow-redirects "^1.3.0" - is-buffer "^1.1.5" - babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" @@ -1422,7 +1414,7 @@ debounce@^1.2.0: resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131" integrity sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg== -debug@3.1.0, debug@=3.1.0, debug@^3.1.0: +debug@3.1.0, debug@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== @@ -1938,13 +1930,6 @@ flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: inherits "^2.0.1" readable-stream "^2.0.4" -follow-redirects@^1.3.0: - version "1.5.8" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.8.tgz#1dbfe13e45ad969f813e86c00e5296f525c885a1" - integrity sha512-sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg== - dependencies: - debug "=3.1.0" - for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"