From fa07e9bee7094468a5dfdd99bae64ef1904470b1 Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Fri, 25 Oct 2019 15:21:50 +0900 Subject: [PATCH 001/795] refactoring --- src/extension.ts | 37 +++++++++++++++++++------------------ src/lineCache.ts | 10 +++++++--- src/preview.ts | 43 +++++++++++++++++++++++-------------------- src/rGitignore.ts | 2 +- src/rTerminal.ts | 36 ++++++++++++++++++++---------------- src/util.ts | 2 +- 6 files changed, 71 insertions(+), 59 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index c27d1f9eb..0fb5544c5 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,9 +1,9 @@ "use strict"; // The module 'vscode' contains the VS Code extensibility API // Import the module and reference it with the alias vscode in your code below -import { isNull } from "util"; import { commands, CompletionItem, ExtensionContext, IndentAction, languages, Position, TextDocument, window } from "vscode"; + import { previewDataframe, previewEnvironment } from "./preview"; import { createGitignore } from "./rGitignore"; import { chooseTerminal, chooseTerminalAndSendText, createRTerm, deleteTerminal, @@ -22,7 +22,7 @@ const roxygenTagCompletionItems = [ "keywords", "method", "name", "md", "noMd", "noRd", "note", "param", "rdname", "rawRd", "references", "return", "section", "seealso", "slot", "source", "template", "templateVar", - "title", "usage"].map((x) => new CompletionItem(x + " ")); + "title", "usage"].map((x: string) => new CompletionItem(`${x} `)); // This method is called when your extension is activated // Your extension is activated the very first time the command is executed @@ -37,10 +37,10 @@ export function activate(context: ExtensionContext) { function runSource(echo: boolean) { const wad = window.activeTextEditor.document; wad.save(); - let rPath = ToRStringLiteral(wad.fileName, '"'); - let encodingParam = config.get("source.encoding") as string; + let rPath: string = ToRStringLiteral(wad.fileName, '"'); + let encodingParam = config.get("source.encoding"); if (encodingParam) { - encodingParam = `encoding = "${encodingParam}"`; + encodingParam = `encoding = "${String(encodingParam)}"`; rPath = [rPath, encodingParam].join(", "); } if (echo) { @@ -50,18 +50,18 @@ export function activate(context: ExtensionContext) { } function knitRmd(echo: boolean, outputFormat: string) { - const wad = window.activeTextEditor.document; + const wad: TextDocument = window.activeTextEditor.document; wad.save(); let rPath = ToRStringLiteral(wad.fileName, '"'); - let encodingParam = config.get("source.encoding") as string; + let encodingParam = config.get("source.encoding"); if (encodingParam) { - encodingParam = `encoding = "${encodingParam}"`; + encodingParam = `encoding = "${String(encodingParam)}"`; rPath = [rPath, encodingParam].join(", "); } if (echo) { rPath = [rPath, "echo = TRUE"].join(", "); } - if (isNull(outputFormat)) { + if (outputFormat === undefined) { chooseTerminalAndSendText(`rmarkdown::render(${rPath})`); } else { chooseTerminalAndSendText(`rmarkdown::render(${rPath}, "${outputFormat}")`); @@ -70,7 +70,7 @@ export function activate(context: ExtensionContext) { async function runSelection(rFunctionName: string[]) { const callableTerminal = await chooseTerminal(); - if (isNull(callableTerminal)) { + if (callableTerminal === undefined) { return; } runSelectionInTerm(callableTerminal, rFunctionName); @@ -78,7 +78,7 @@ export function activate(context: ExtensionContext) { async function runSelectionInActiveTerm(rFunctionName: string[]) { const callableTerminal = await chooseTerminal(true); - if (isNull(callableTerminal)) { + if (callableTerminal === undefined) { return; } runSelectionInTerm(callableTerminal, rFunctionName); @@ -86,18 +86,19 @@ export function activate(context: ExtensionContext) { languages.registerCompletionItemProvider("r", { provideCompletionItems(document: TextDocument, position: Position) { - if (document.lineAt(position).text.substr(0, 2) === "#'") { + if (document.lineAt(position).text + .substr(0, 2) === "#'") { return roxygenTagCompletionItems; - } else { - return undefined; } + + return undefined; }, - }, "@"); // Trigger on '@' + }, "@"); // Trigger on '@' languages.setLanguageConfiguration("r", { onEnterRules: [{ // Automatically continue roxygen comments: #' action: { indentAction: IndentAction.None, appendText: "#' " }, - beforeText: /^#'.*/, + beforeText: /^#'.*/, }], wordPattern, }); @@ -109,7 +110,7 @@ export function activate(context: ExtensionContext) { commands.registerCommand("r.thead", () => runSelection(["t", "head"])), commands.registerCommand("r.names", () => runSelection(["names"])), commands.registerCommand("r.runSource", () => runSource(false)), - commands.registerCommand("r.knitRmd", () => knitRmd(false, null)), + commands.registerCommand("r.knitRmd", () => knitRmd(false, undefined)), commands.registerCommand("r.knitRmdToPdf", () => knitRmd(false, "pdf_document")), commands.registerCommand("r.knitRmdToHtml", () => knitRmd(false, "html_document")), commands.registerCommand("r.knitRmdToAll", () => knitRmd(false, "all")), @@ -130,6 +131,6 @@ export function activate(context: ExtensionContext) { } // This method is called when your extension is deactivated -// export function deactivate() { +// Export function deactivate() { // } diff --git a/src/lineCache.ts b/src/lineCache.ts index 0ded21567..cdecbcbef 100644 --- a/src/lineCache.ts +++ b/src/lineCache.ts @@ -8,7 +8,7 @@ export class LineCache { public endsInOperatorCache: Map; public getLine: (line: number) => string; public lineCount: number; - constructor(getLine: (line: number) => string, lineCount: number) { + public constructor(getLine: (line: number) => string, lineCount: number) { this.getLine = getLine; this.lineCount = lineCount; this.lineCache = new Map(); @@ -20,6 +20,7 @@ export class LineCache { this.addLineToCache(line); } const s = this.lineCache.get(line); + return (s); } public getEndsInOperatorFromCache(line: number) { @@ -28,6 +29,7 @@ export class LineCache { this.addLineToCache(line); } const s = this.endsInOperatorCache.get(line); + return (s); } public addLineToCache(line: number) { @@ -39,12 +41,14 @@ export class LineCache { } function cleanLine(text: string) { - const cleaned = text.replace(/\s*\#.*/, ""); // Remove comments and preceeding spaces + const cleaned = text.replace(/\s*\#.*/, ""); + return (cleaned); } function doesLineEndInOperator(text: string) { const endingOperatorIndex = text.search(/(,|\+|!|\$|\^|&|\*|-|=|:|\'|~|\||\/|\?|%.*%)(\s*|\s*\#.*)$/); - const spacesOnlyIndex = text.search(/^\s*$/); // Space-only lines also counted. + const spacesOnlyIndex = text.search(/^\s*$/); + return ((0 <= endingOperatorIndex) || (0 <= spacesOnlyIndex)); } diff --git a/src/preview.ts b/src/preview.ts index 4646e5f20..4ccee4402 100644 --- a/src/preview.ts +++ b/src/preview.ts @@ -2,6 +2,7 @@ import fs = require("fs-extra"); import { commands, extensions, window, workspace } from "vscode"; + import { chooseTerminalAndSendText } from "./rTerminal"; import { getSelection } from "./selection"; import { checkForSpecialCharacters, checkIfFileExists, delay } from "./util"; @@ -11,22 +12,22 @@ export async function previewEnvironment() { return; } const tmpDir = makeTmpDir(); - const pathToTmpCsv = tmpDir + "/environment.csv"; + const pathToTmpCsv = `${tmpDir}/environment.csv`; const envName = "name=ls()"; const envClass = "class=sapply(ls(), function(x) {class(get(x, envir = parent.env(environment())))[1]})"; const envOut = "out=sapply(ls(), function(x) {capture.output(str(get(x, envir = parent.env(environment()))), silent = T)[1]})"; const rWriteCsvCommand = "write.csv(data.frame(" - + envName + "," - + envClass + "," - + envOut + "), '" - + pathToTmpCsv + "', row.names=FALSE, quote = TRUE)"; + + `${envName},` + + `${envClass},` + + `${envOut}), '` + + `${pathToTmpCsv}', row.names=FALSE, quote = TRUE)`; chooseTerminalAndSendText(rWriteCsvCommand); await openTmpCSV(pathToTmpCsv, tmpDir); } export async function previewDataframe() { if (!checkcsv()) { - return; + return undefined; } const selectedTextArray = getSelection().selectedTextArray; @@ -34,16 +35,16 @@ export async function previewDataframe() { if (selectedTextArray.length !== 1 || !checkForSpecialCharacters(dataframeName)) { window.showInformationMessage("This does not appear to be a dataframe."); + return false; } const tmpDir = makeTmpDir(); // Create R write CSV command. Turn off row names and quotes, they mess with Excel Viewer. - const pathToTmpCsv = tmpDir + "/" + dataframeName + ".csv"; - const rWriteCsvCommand = "write.csv(" + dataframeName + ", '" - + pathToTmpCsv - + "', row.names = FALSE, quote = FALSE)"; + const pathToTmpCsv = `${tmpDir}/${dataframeName}.csv`; + const rWriteCsvCommand = `write.csv(${dataframeName}, '` + + `'${pathToTmpCsv}', row.names = FALSE, quote = FALSE)`; chooseTerminalAndSendText(rWriteCsvCommand); await openTmpCSV(pathToTmpCsv, tmpDir); } @@ -54,6 +55,7 @@ async function openTmpCSV(pathToTmpCsv: string, tmpDir: string) { if (!checkIfFileExists(pathToTmpCsv)) { window.showErrorMessage("Dataframe failed to display."); fs.removeSync(tmpDir); + return false; } @@ -62,6 +64,7 @@ async function openTmpCSV(pathToTmpCsv: string, tmpDir: string) { if (!success) { window.showWarningMessage("Visual Studio Code currently limits opening files to 20 MB."); fs.removeSync(tmpDir); + return false; } @@ -94,9 +97,8 @@ async function waitForFileToFinish(filePath) { if (currentSize === previousSize) { return true; - } else { - previousSize = currentSize; } + previousSize = currentSize; await delay(50); } } @@ -112,6 +114,7 @@ function makeTmpDir() { if (!fs.existsSync(tmpDir)) { fs.mkdirSync(tmpDir); } + return tmpDir; } @@ -119,13 +122,13 @@ function checkcsv() { const iscsv = extensions.getExtension("GrapeCity.gc-excelviewer"); if (iscsv && iscsv.isActive) { return true; - } else { - window.showInformationMessage("This function need to install `GrapeCity.gc-excelviewer`, will you install?", - "Yes", "No").then((select) => { - if (select === "Yes") { - commands.executeCommand("workbench.extensions.installExtension", "GrapeCity.gc-excelviewer"); - } - }); - return false; } + window.showInformationMessage("This function need to install `GrapeCity.gc-excelviewer`, will you install?", + "Yes", "No").then((select) => { + if (select === "Yes") { + commands.executeCommand("workbench.extensions.installExtension", "GrapeCity.gc-excelviewer"); + } + }); + + return false; } diff --git a/src/rGitignore.ts b/src/rGitignore.ts index 0669c79a0..7594d1607 100644 --- a/src/rGitignore.ts +++ b/src/rGitignore.ts @@ -25,7 +25,7 @@ export function createGitignore() { window.showWarningMessage("Please open workspace to create .gitignore"); return; } - const ignorePath = path.join(workspace.workspaceFolders[0].uri.path, ".gitignore"); + const ignorePath = path.join(workspace.workspaceFolders[0].uri.path, ".gitignore"); fs.writeFile(ignorePath, ignoreFiles, (err) => { try { if (err) { diff --git a/src/rTerminal.ts b/src/rTerminal.ts index 062389dae..4abaecf7c 100644 --- a/src/rTerminal.ts +++ b/src/rTerminal.ts @@ -1,8 +1,9 @@ "use strict"; import fs = require("fs-extra"); -import { isNull } from "util"; +import { isDeepStrictEqual } from "util"; import { commands, Terminal, window } from "vscode"; + import { getSelection } from "./selection"; import { config, delay, getRpath } from "./util"; export let rTerm: Terminal; @@ -13,22 +14,23 @@ export function createRTerm(preserveshow?: boolean): boolean { if (!termPath) { return; } - const termOpt = config.get("rterm.option") as string[]; + const termOpt: string[] = config.get("rterm.option"); fs.pathExists(termPath, (err, exists) => { if (exists) { rTerm = window.createTerminal(termName, termPath, termOpt); rTerm.show(preserveshow); + return true; - } else { - window.showErrorMessage("Cannot find R client. Please check R path in preferences and reload."); - return false; } + window.showErrorMessage("Cannot find R client. Please check R path in preferences and reload."); + + return false; }); } export function deleteTerminal(term: Terminal) { - if (term === rTerm) { - rTerm = null; + if (isDeepStrictEqual(term, rTerm)) { + rTerm = undefined; } } @@ -36,10 +38,11 @@ export async function chooseTerminal(active: boolean = false) { if (active || config.get("alwaysUseActiveTerminal")) { if (window.terminals.length < 1) { window.showInformationMessage("There are no open terminals."); - return null; - } else { - return window.activeTerminal; + + return undefined; } + + return window.activeTerminal; } if (window.terminals.length > 0) { @@ -50,8 +53,7 @@ export async function chooseTerminal(active: boolean = false) { return window.activeTerminal; } } else { - // Creating a terminal when there aren't any already - // does not seem to set activeTerminal + // Creating a terminal when there aren't any already does not seem to set activeTerminal if (window.terminals.length === 1) { const activeTerminalName = window.terminals[0].name; if (RTermNameOpinions.includes(activeTerminalName)) { @@ -60,7 +62,8 @@ export async function chooseTerminal(active: boolean = false) { } else { // tslint:disable-next-line: max-line-length window.showInformationMessage("Error identifying terminal! This shouldn't happen, so please file an issue at https://github.com/Ikuyadeu/vscode-R/issues"); - return null; + + return undefined; } } } @@ -69,9 +72,10 @@ export async function chooseTerminal(active: boolean = false) { const success = createRTerm(true); await delay(200); // Let RTerm warm up if (!success) { - return null; + return undefined; } } + return rTerm; } @@ -105,7 +109,7 @@ export async function runSelectionInTerm(term: Terminal, rFunctionName: string[] export async function chooseTerminalAndSendText(text: string) { const callableTerminal = await chooseTerminal(); - if (isNull(callableTerminal)) { + if (callableTerminal === undefined) { return; } callableTerminal.sendText(text); @@ -113,6 +117,6 @@ export async function chooseTerminalAndSendText(text: string) { } function setFocus(term: Terminal) { - const focus = config.get("source.focus") as string; + const focus: string = config.get("source.focus"); term.show(focus !== "terminal"); } diff --git a/src/util.ts b/src/util.ts index 4a7e82170..b1361ea93 100644 --- a/src/util.ts +++ b/src/util.ts @@ -18,7 +18,7 @@ export function getRpath() { } export function ToRStringLiteral(s: string, quote: string) { - if (s === null) { + if (s === undefined) { return "NULL"; } return (quote + From 4c2e05f4a373cbd755adbd2279c155acb0c03131 Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Sat, 26 Oct 2019 14:14:09 +0900 Subject: [PATCH 002/795] version 1.1.6 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 777fa9619..e719f73b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 1.1.6 + +* Fix behaviour when workplacefolders is Undefiend (thankyou @masterhands) +* Show r.term.option value in settings UI +* Refactoring + ## 1.1.5 * Replace deprecated function (Refactoring) diff --git a/package.json b/package.json index 8eff4086f..121e05c3b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "r", "displayName": "R", "description": "Support for R language(run,syntax,snippet)", - "version": "1.1.5", + "version": "1.1.6", "author": "Yuki Ueda", "license": "SEE LICENSE IN LICENSE", "publisher": "Ikuyadeu", From b13ac29c32003ea34fd940578084f5081072547d Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Mon, 28 Oct 2019 13:30:50 +0900 Subject: [PATCH 003/795] remove duplicated quote #139 --- src/preview.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/preview.ts b/src/preview.ts index 4ccee4402..e496f218a 100644 --- a/src/preview.ts +++ b/src/preview.ts @@ -43,7 +43,7 @@ export async function previewDataframe() { // Create R write CSV command. Turn off row names and quotes, they mess with Excel Viewer. const pathToTmpCsv = `${tmpDir}/${dataframeName}.csv`; - const rWriteCsvCommand = `write.csv(${dataframeName}, '` + const rWriteCsvCommand = `write.csv(${dataframeName}, ` + `'${pathToTmpCsv}', row.names = FALSE, quote = FALSE)`; chooseTerminalAndSendText(rWriteCsvCommand); await openTmpCSV(pathToTmpCsv, tmpDir); From 1545d07b7777c9ce2af40fcbb14f8be5e73a50b0 Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Mon, 28 Oct 2019 13:31:11 +0900 Subject: [PATCH 004/795] version 1.1.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 121e05c3b..5042152fa 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "r", "displayName": "R", "description": "Support for R language(run,syntax,snippet)", - "version": "1.1.6", + "version": "1.1.7", "author": "Yuki Ueda", "license": "SEE LICENSE IN LICENSE", "publisher": "Ikuyadeu", From 9ecbbecd3334509f2992bc5391d52163cadc0e70 Mon Sep 17 00:00:00 2001 From: Andrew Craig Date: Sat, 2 Nov 2019 14:05:21 +0900 Subject: [PATCH 005/795] Use word under cursor for previewDataframe, nrow --- src/extension.ts | 35 +++++++++++++++++++++++------------ src/preview.ts | 4 ++-- src/rTerminal.ts | 21 ++++++++------------- src/selection.ts | 27 +++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 27 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 0fb5544c5..8158c4811 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -7,7 +7,8 @@ import { commands, CompletionItem, ExtensionContext, IndentAction, import { previewDataframe, previewEnvironment } from "./preview"; import { createGitignore } from "./rGitignore"; import { chooseTerminal, chooseTerminalAndSendText, createRTerm, deleteTerminal, - runSelectionInTerm } from "./rTerminal"; + runSelectionInTerm, runTextInTerm } from "./rTerminal"; +import { getWordOrSelection, surroundSelection } from "./selection"; import { config, ToRStringLiteral } from "./util"; const wordPattern = /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\<\>\/\s]+)/g; @@ -68,20 +69,30 @@ export function activate(context: ExtensionContext) { } } - async function runSelection(rFunctionName: string[]) { + async function runSelection() { const callableTerminal = await chooseTerminal(); if (callableTerminal === undefined) { return; } - runSelectionInTerm(callableTerminal, rFunctionName); + runSelectionInTerm(callableTerminal); } - async function runSelectionInActiveTerm(rFunctionName: string[]) { + async function runSelectionInActiveTerm() { const callableTerminal = await chooseTerminal(true); if (callableTerminal === undefined) { return; } - runSelectionInTerm(callableTerminal, rFunctionName); + runSelectionInTerm(callableTerminal); + } + + async function runSelectionOrWord(rFunctionName: string[]) { + const callableTerminal = await chooseTerminal(); + if (callableTerminal === undefined) { + return; + } + const text = getWordOrSelection(); + const wrappedText = surroundSelection(text, rFunctionName); + runTextInTerm(callableTerminal, wrappedText); } languages.registerCompletionItemProvider("r", { @@ -104,11 +115,11 @@ export function activate(context: ExtensionContext) { }); context.subscriptions.push( - commands.registerCommand("r.nrow", () => runSelection(["nrow"])), - commands.registerCommand("r.length", () => runSelection(["length"])), - commands.registerCommand("r.head", () => runSelection(["head"])), - commands.registerCommand("r.thead", () => runSelection(["t", "head"])), - commands.registerCommand("r.names", () => runSelection(["names"])), + commands.registerCommand("r.nrow", () => runSelectionOrWord(["nrow"])), + commands.registerCommand("r.length", () => runSelectionOrWord(["length"])), + commands.registerCommand("r.head", () => runSelectionOrWord(["head"])), + commands.registerCommand("r.thead", () => runSelectionOrWord(["t", "head"])), + commands.registerCommand("r.names", () => runSelectionOrWord(["names"])), commands.registerCommand("r.runSource", () => runSource(false)), commands.registerCommand("r.knitRmd", () => knitRmd(false, undefined)), commands.registerCommand("r.knitRmdToPdf", () => knitRmd(false, "pdf_document")), @@ -116,8 +127,8 @@ export function activate(context: ExtensionContext) { commands.registerCommand("r.knitRmdToAll", () => knitRmd(false, "all")), commands.registerCommand("r.createRTerm", createRTerm), commands.registerCommand("r.runSourcewithEcho", () => runSource(true)), - commands.registerCommand("r.runSelection", () => runSelection([])), - commands.registerCommand("r.runSelectionInActiveTerm", () => runSelectionInActiveTerm([])), + commands.registerCommand("r.runSelection", () => runSelection()), + commands.registerCommand("r.runSelectionInActiveTerm", () => runSelectionInActiveTerm()), commands.registerCommand("r.createGitignore", createGitignore), commands.registerCommand("r.previewDataframe", previewDataframe), commands.registerCommand("r.previewEnvironment", previewEnvironment), diff --git a/src/preview.ts b/src/preview.ts index e496f218a..322e53ad6 100644 --- a/src/preview.ts +++ b/src/preview.ts @@ -4,7 +4,7 @@ import fs = require("fs-extra"); import { commands, extensions, window, workspace } from "vscode"; import { chooseTerminalAndSendText } from "./rTerminal"; -import { getSelection } from "./selection"; +import { getWordOrSelection } from "./selection"; import { checkForSpecialCharacters, checkIfFileExists, delay } from "./util"; export async function previewEnvironment() { @@ -30,7 +30,7 @@ export async function previewDataframe() { return undefined; } - const selectedTextArray = getSelection().selectedTextArray; + const selectedTextArray = getWordOrSelection(); const dataframeName = selectedTextArray[0]; if (selectedTextArray.length !== 1 || !checkForSpecialCharacters(dataframeName)) { diff --git a/src/rTerminal.ts b/src/rTerminal.ts index 4abaecf7c..4541a4c10 100644 --- a/src/rTerminal.ts +++ b/src/rTerminal.ts @@ -79,29 +79,24 @@ export async function chooseTerminal(active: boolean = false) { return rTerm; } -export async function runSelectionInTerm(term: Terminal, rFunctionName: string[]) { +export async function runSelectionInTerm(term: Terminal) { const selection = getSelection(); if (selection.linesDownToMoveCursor > 0) { commands.executeCommand("cursorMove", { to: "down", value: selection.linesDownToMoveCursor }); commands.executeCommand("cursorMove", { to: "wrappedLineFirstNonWhitespaceCharacter" }); } + runTextInTerm(term, selection.selectedTextArray); +} - if (selection.selectedTextArray.length > 1 && config.get("bracketedPaste")) { +export async function runTextInTerm(term: Terminal, textArray: string[]) { + if (textArray.length > 1 && config.get("bracketedPaste")) { // Surround with ANSI control characters for bracketed paste mode - selection.selectedTextArray[0] = "\x1b[200~" + selection.selectedTextArray[0]; - selection.selectedTextArray[selection.selectedTextArray.length - 1] += "\x1b[201~"; + textArray[0] = "\x1b[200~" + textArray[0]; + textArray[textArray.length - 1] += "\x1b[201~"; } - for (let line of selection.selectedTextArray) { + for (const line of textArray) { await delay(8); // Increase delay if RTerm can't handle speed. - - if (rFunctionName && rFunctionName.length) { - let rFunctionCall = ""; - for (const feature of rFunctionName) { - rFunctionCall += feature + "("; - } - line = rFunctionCall + line.trim() + ")".repeat(rFunctionName.length); - } term.sendText(line); } setFocus(term); diff --git a/src/selection.ts b/src/selection.ts index b70f7e98e..fea0d7ad6 100644 --- a/src/selection.ts +++ b/src/selection.ts @@ -3,6 +3,33 @@ import { Position, Range, window} from "vscode"; import { LineCache } from "./lineCache"; +export function getWordOrSelection() { + const selection = window.activeTextEditor.selection; + const currentDocument = window.activeTextEditor.document; + let text: string; + if ((selection.start.line === selection.end.line) && + (selection.start.character === selection.end.character)) { + const wordRange = currentDocument.getWordRangeAtPosition(selection.start); + text = currentDocument.getText(wordRange); + } else { + text = currentDocument.getText(window.activeTextEditor.selection); + } + return text.split("\n"); +} + +export function surroundSelection(textArray: string[], rFunctionName: string[]) { + for (let i: number = 0; i < textArray.length; i++) { + if (rFunctionName && rFunctionName.length) { + let rFunctionCall = ""; + for (const feature of rFunctionName) { + rFunctionCall += feature + "("; + } + textArray[i] = rFunctionCall + textArray[i].trim() + ")".repeat(rFunctionName.length); + } + } + return textArray; +} + export function getSelection(): any { const selection = { linesDownToMoveCursor: 0, selectedTextArray: [] }; const { start, end } = window.activeTextEditor.selection; From a8696278596d68a3bcb3c00a0cbd5f014c62e9d8 Mon Sep 17 00:00:00 2001 From: Andrew Craig Date: Sat, 2 Nov 2019 15:09:41 +0900 Subject: [PATCH 006/795] Apply functions once instead of to each line --- src/selection.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/selection.ts b/src/selection.ts index fea0d7ad6..c80e060a1 100644 --- a/src/selection.ts +++ b/src/selection.ts @@ -18,14 +18,14 @@ export function getWordOrSelection() { } export function surroundSelection(textArray: string[], rFunctionName: string[]) { - for (let i: number = 0; i < textArray.length; i++) { - if (rFunctionName && rFunctionName.length) { - let rFunctionCall = ""; - for (const feature of rFunctionName) { - rFunctionCall += feature + "("; - } - textArray[i] = rFunctionCall + textArray[i].trim() + ")".repeat(rFunctionName.length); + if (rFunctionName && rFunctionName.length) { + let rFunctionCall = ""; + for (const feature of rFunctionName) { + rFunctionCall += feature + "("; } + textArray[0] = rFunctionCall + textArray[0].trimLeft(); + const end = textArray.length - 1; + textArray[end] = textArray[end].trimRight() + ")".repeat(rFunctionName.length); } return textArray; } From 7eee7970e537d8beb7ee5f429a2eea2ae3cd839c Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Sat, 9 Nov 2019 14:47:47 +0900 Subject: [PATCH 007/795] remove extra calling --- src/extension.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 8158c4811..859df4d91 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -127,8 +127,8 @@ export function activate(context: ExtensionContext) { commands.registerCommand("r.knitRmdToAll", () => knitRmd(false, "all")), commands.registerCommand("r.createRTerm", createRTerm), commands.registerCommand("r.runSourcewithEcho", () => runSource(true)), - commands.registerCommand("r.runSelection", () => runSelection()), - commands.registerCommand("r.runSelectionInActiveTerm", () => runSelectionInActiveTerm()), + commands.registerCommand("r.runSelection", runSelection), + commands.registerCommand("r.runSelectionInActiveTerm", runSelectionInActiveTerm), commands.registerCommand("r.createGitignore", createGitignore), commands.registerCommand("r.previewDataframe", previewDataframe), commands.registerCommand("r.previewEnvironment", previewEnvironment), From acf15076f51e75a1a3cbc8a3e248c3242d0ec49a Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Sat, 9 Nov 2019 16:17:26 +0900 Subject: [PATCH 008/795] style fix --- package-lock.json | 891 +++++++++------------------------------------- package.json | 8 +- src/extension.ts | 28 +- src/lineCache.ts | 2 +- src/preview.ts | 28 +- src/rGitignore.ts | 37 +- src/rTerminal.ts | 22 +- src/selection.ts | 51 +-- src/util.ts | 31 +- src/viewer.ts | 2 +- 10 files changed, 274 insertions(+), 826 deletions(-) diff --git a/package-lock.json b/package-lock.json index d63931027..734e0040b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "r", - "version": "1.1.5", + "version": "1.1.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -25,9 +25,9 @@ } }, "@types/fs-extra": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.0.0.tgz", - "integrity": "sha512-bCtL5v9zdbQW86yexOlXWTEGvLNqWxMFyi7gQA7Gcthbezr2cPSOb8SkESVKA937QD5cIwOFLDFt0MQoXOEr9Q==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.0.1.tgz", + "integrity": "sha512-J00cVDALmi/hJOYsunyT52Hva5TnJeKP5yd1r+mH/ZU0mbYZflR0Z5kw5kITtKTRYMhm1JMClOFYdHnQszEvqw==", "dev": true, "requires": { "@types/node": "*" @@ -45,6 +45,12 @@ "integrity": "sha512-FMdVn84tJJdV+xe+53sYiZS4R5yn1mAIxfj+DVoNiQjTYz1+OYmjwEZr1ev9nU0axXwda0QDbYl06QHanRVH3A==", "dev": true }, + "@types/vscode": { + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.40.0.tgz", + "integrity": "sha512-5kEIxL3qVRkwhlMerxO7XuMffa+0LBl+iG2TcRa0NsdoeSFLkt/9hJ02jsi/Kvc6y8OVF2N2P2IHP5S4lWf/5w==", + "dev": true + }, "@webassemblyjs/ast": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", @@ -239,15 +245,6 @@ "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", "dev": true }, - "agent-base": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", - "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", - "dev": true, - "requires": { - "es6-promisify": "^5.0.0" - } - }, "ajv": { "version": "6.10.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", @@ -465,15 +462,6 @@ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, "asn1.js": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", @@ -495,12 +483,6 @@ "util": "0.10.3" } }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, "assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", @@ -513,30 +495,12 @@ "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", "dev": true }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "dev": true }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", - "dev": true - }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -604,15 +568,6 @@ "integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=", "dev": true }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, "big.js": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", @@ -908,12 +863,6 @@ "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=", "dev": true }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -1086,22 +1035,44 @@ "dev": true }, "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } } }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, "coffee-script": { "version": "1.12.7", "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz", @@ -1133,15 +1104,6 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, - "combined-stream": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", - "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", @@ -1370,15 +1332,6 @@ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=", "dev": true }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", @@ -1462,12 +1415,6 @@ } } }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, "des.js": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", @@ -1566,16 +1513,6 @@ } } }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, "elliptic": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz", @@ -1642,17 +1579,21 @@ } }, "es-abstract": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", - "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz", + "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==", "dev": true, "requires": { "es-to-primitive": "^1.2.0", "function-bind": "^1.1.1", "has": "^1.0.3", + "has-symbols": "^1.0.0", "is-callable": "^1.1.4", "is-regex": "^1.0.4", - "object-keys": "^1.0.12" + "object-inspect": "^1.6.0", + "object-keys": "^1.1.1", + "string.prototype.trimleft": "^2.1.0", + "string.prototype.trimright": "^2.1.0" } }, "es-to-primitive": { @@ -1666,21 +1607,6 @@ "is-symbol": "^1.0.2" } }, - "es6-promise": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz", - "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==", - "dev": true - }, - "es6-promisify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", - "dev": true, - "requires": { - "es6-promise": "^4.0.3" - } - }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -1814,12 +1740,6 @@ "homedir-polyfill": "^1.0.1" } }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, "extend-shallow": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", @@ -1906,12 +1826,6 @@ } } }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, "fast-deep-equal": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", @@ -2110,9 +2024,9 @@ }, "dependencies": { "is-buffer": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", - "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", "dev": true } } @@ -2165,23 +2079,6 @@ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, "fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", @@ -2828,9 +2725,9 @@ "dev": true }, "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, "get-stream": { @@ -2845,15 +2742,6 @@ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", "dev": true }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", @@ -2978,22 +2866,6 @@ "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", - "dev": true, - "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" - } - }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -3113,71 +2985,12 @@ "parse-passwd": "^1.0.0" } }, - "http-proxy-agent": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", - "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", - "dev": true, - "requires": { - "agent-base": "4", - "debug": "3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, "https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, - "https-proxy-agent": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.3.tgz", - "integrity": "sha512-Ytgnz23gm2DVftnzqRRz2dOXZbGd2uiajSw/95bPp6v53zPRspQjLm/AfBgqbJ2qfeRXWIOMVLpp86+/5yX39Q==", - "dev": true, - "requires": { - "agent-base": "^4.3.0", - "debug": "^3.1.0" - }, - "dependencies": { - "agent-base": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", - "dev": true, - "requires": { - "es6-promisify": "^5.0.0" - } - } - } - }, "ieee754": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", @@ -3462,12 +3275,6 @@ "has-symbols": "^1.0.0" } }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -3498,12 +3305,6 @@ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3520,36 +3321,18 @@ "esprima": "^4.0.0" } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", "dev": true }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, "json5": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", @@ -3567,18 +3350,6 @@ "graceful-fs": "^4.1.6" } }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", @@ -3790,21 +3561,6 @@ "brorand": "^1.0.1" } }, - "mime-db": { - "version": "1.38.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz", - "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==", - "dev": true - }, - "mime-types": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz", - "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==", - "dev": true, - "requires": { - "mime-db": "~1.38.0" - } - }, "mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", @@ -3953,9 +3709,9 @@ "dev": true }, "mocha": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.0.tgz", - "integrity": "sha512-qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.2.tgz", + "integrity": "sha512-FgDS9Re79yU1xz5d+C4rv1G7QagNGHZ+iXF81hO8zY35YZZcLEsJVfFolfsqKFWunATEvNzMK0r/CwWd/szO9A==", "dev": true, "requires": { "ansi-colors": "3.2.3", @@ -3978,55 +3734,11 @@ "supports-color": "6.0.0", "which": "1.3.1", "wide-align": "1.1.3", - "yargs": "13.2.2", - "yargs-parser": "13.0.0", - "yargs-unparser": "1.5.0" + "yargs": "13.3.0", + "yargs-parser": "13.1.1", + "yargs-unparser": "1.6.0" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", @@ -4035,35 +3747,6 @@ "requires": { "isexe": "^2.0.0" } - }, - "yargs": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz", - "integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "os-locale": "^3.1.0", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.0.0" - } - }, - "yargs-parser": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz", - "integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } } } }, @@ -4234,9 +3917,9 @@ }, "dependencies": { "semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true } } @@ -4353,18 +4036,6 @@ "path-key": "^2.0.0" } }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -4402,6 +4073,12 @@ } } }, + "object-inspect": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz", + "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==", + "dev": true + }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -4721,12 +4398,6 @@ "sha.js": "^2.4.8" } }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, "picomatch": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz", @@ -4800,12 +4471,6 @@ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", "dev": true }, - "psl": { - "version": "1.1.31", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", - "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==", - "dev": true - }, "public-encrypt": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", @@ -4859,12 +4524,6 @@ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - }, "querystring": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", @@ -4877,12 +4536,6 @@ "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", "dev": true }, - "querystringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz", - "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==", - "dev": true - }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -5127,34 +4780,6 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, - "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - } - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -5162,15 +4787,9 @@ "dev": true }, "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, "resolve": { @@ -5275,12 +4894,6 @@ "ret": "~0.1.10" } }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", @@ -5532,24 +5145,6 @@ "urix": "^0.1.0" } }, - "source-map-support": { - "version": "0.5.11", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", - "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -5571,23 +5166,6 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, "ssri": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", @@ -5731,6 +5309,26 @@ "strip-ansi": "^4.0.0" } }, + "string.prototype.trimleft": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz", + "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, + "string.prototype.trimright": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz", + "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", @@ -5914,24 +5512,6 @@ "is-number": "^7.0.0" } }, - "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "dev": true, - "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - } - } - }, "ts-loader": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.0.tgz", @@ -5960,9 +5540,9 @@ "dev": true }, "tslint": { - "version": "5.20.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.0.tgz", - "integrity": "sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g==", + "version": "5.20.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", + "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -5981,9 +5561,9 @@ }, "dependencies": { "commander": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.1.tgz", - "integrity": "sha512-cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, "diff": { @@ -6009,21 +5589,6 @@ "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -6171,16 +5736,6 @@ } } }, - "url-parse": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz", - "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==", - "dev": true, - "requires": { - "querystringify": "^2.0.0", - "requires-port": "^1.0.0" - } - }, "url-parse-lax": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", @@ -6217,150 +5772,18 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", - "dev": true - }, "v8-compile-cache": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz", "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==", "dev": true }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, "vm-browserify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz", "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==", "dev": true }, - "vscode": { - "version": "1.1.33", - "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.33.tgz", - "integrity": "sha512-sXedp2oF6y4ZvqrrFiZpeMzaCLSWV+PpYkIxjG/iYquNZ9KrLL2LujltGxPLvzn49xu2sZkyC+avVNFgcJD1Iw==", - "dev": true, - "requires": { - "glob": "^7.1.2", - "mocha": "^4.0.1", - "request": "^2.88.0", - "semver": "^5.4.1", - "source-map-support": "^0.5.0", - "url-parse": "^1.4.4", - "vscode-test": "^0.1.4" - }, - "dependencies": { - "browser-stdout": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", - "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", - "dev": true - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "diff": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz", - "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==", - "dev": true - }, - "growl": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", - "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", - "dev": true - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true - }, - "mocha": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz", - "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==", - "dev": true, - "requires": { - "browser-stdout": "1.3.0", - "commander": "2.11.0", - "debug": "3.1.0", - "diff": "3.3.1", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.3", - "he": "1.1.1", - "mkdirp": "0.5.1", - "supports-color": "4.4.0" - }, - "dependencies": { - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", - "dev": true, - "requires": { - "has-flag": "^2.0.0" - } - } - } - }, - "vscode-test": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-0.1.5.tgz", - "integrity": "sha512-s+lbF1Dtasc0yXVB9iQTexBe2JK6HJAUJe3fWezHKIjq+xRw5ZwCMEMBaonFIPy7s95qg2HPTRDR5W4h4kbxGw==", - "dev": true, - "requires": { - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.1" - } - }, "watchpack": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", @@ -6752,48 +6175,40 @@ } }, "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" }, "dependencies": { "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } }, "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "^4.1.0" } } } @@ -6910,29 +6325,55 @@ } }, "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", + "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", + "cliui": "^5.0.0", "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", + "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", + "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^2.0.0", + "string-width": "^3.0.0", "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" + "y18n": "^4.0.0", + "yargs-parser": "^13.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } } }, "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", + "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -6948,14 +6389,14 @@ } }, "yargs-unparser": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.5.0.tgz", - "integrity": "sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", + "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", "dev": true, "requires": { "flat": "^4.1.0", - "lodash": "^4.17.11", - "yargs": "^12.0.5" + "lodash": "^4.17.15", + "yargs": "^13.3.0" } } } diff --git a/package.json b/package.json index 5042152fa..56b29569a 100644 --- a/package.json +++ b/package.json @@ -375,15 +375,15 @@ "test-compile": "tsc -p ./" }, "devDependencies": { - "@types/fs-extra": "^8.0.0", + "@types/fs-extra": "^8.0.1", "@types/mocha": "^5.2.7", "@types/node": "^12.7.8", - "mocha": "^6.2.0", + "@types/vscode": "^1.40.0", + "mocha": "^6.2.2", "node-atomizr": "^0.6.1", "ts-loader": "^6.2.0", - "tslint": "^5.20.0", + "tslint": "^5.20.1", "typescript": "^3.6.3", - "vscode": "^1.1.33", "webpack": "^4.41.0", "webpack-cli": "^3.3.9", "yamljs": "^0.3.0" diff --git a/src/extension.ts b/src/extension.ts index 859df4d91..96aea0842 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -39,11 +39,9 @@ export function activate(context: ExtensionContext) { const wad = window.activeTextEditor.document; wad.save(); let rPath: string = ToRStringLiteral(wad.fileName, '"'); - let encodingParam = config.get("source.encoding"); - if (encodingParam) { - encodingParam = `encoding = "${String(encodingParam)}"`; - rPath = [rPath, encodingParam].join(", "); - } + let encodingParam = config.get("source.encoding"); + encodingParam = `encoding = "${encodingParam}"`; + rPath = [rPath, encodingParam].join(", "); if (echo) { rPath = [rPath, "echo = TRUE"].join(", "); } @@ -54,11 +52,9 @@ export function activate(context: ExtensionContext) { const wad: TextDocument = window.activeTextEditor.document; wad.save(); let rPath = ToRStringLiteral(wad.fileName, '"'); - let encodingParam = config.get("source.encoding"); - if (encodingParam) { - encodingParam = `encoding = "${String(encodingParam)}"`; - rPath = [rPath, encodingParam].join(", "); - } + let encodingParam = config.get("source.encoding"); + encodingParam = `encoding = "${encodingParam}"`; + rPath = [rPath, encodingParam].join(", "); if (echo) { rPath = [rPath, "echo = TRUE"].join(", "); } @@ -120,13 +116,13 @@ export function activate(context: ExtensionContext) { commands.registerCommand("r.head", () => runSelectionOrWord(["head"])), commands.registerCommand("r.thead", () => runSelectionOrWord(["t", "head"])), commands.registerCommand("r.names", () => runSelectionOrWord(["names"])), - commands.registerCommand("r.runSource", () => runSource(false)), - commands.registerCommand("r.knitRmd", () => knitRmd(false, undefined)), - commands.registerCommand("r.knitRmdToPdf", () => knitRmd(false, "pdf_document")), - commands.registerCommand("r.knitRmdToHtml", () => knitRmd(false, "html_document")), - commands.registerCommand("r.knitRmdToAll", () => knitRmd(false, "all")), + commands.registerCommand("r.runSource", () => { runSource(false); }), + commands.registerCommand("r.knitRmd", () => { knitRmd(false, undefined); }), + commands.registerCommand("r.knitRmdToPdf", () => { knitRmd(false, "pdf_document"); }), + commands.registerCommand("r.knitRmdToHtml", () => { knitRmd(false, "html_document"); }), + commands.registerCommand("r.knitRmdToAll", () => { knitRmd(false, "all"); }), commands.registerCommand("r.createRTerm", createRTerm), - commands.registerCommand("r.runSourcewithEcho", () => runSource(true)), + commands.registerCommand("r.runSourcewithEcho", () => { runSource(true); }), commands.registerCommand("r.runSelection", runSelection), commands.registerCommand("r.runSelectionInActiveTerm", runSelectionInActiveTerm), commands.registerCommand("r.createGitignore", createGitignore), diff --git a/src/lineCache.ts b/src/lineCache.ts index cdecbcbef..6f81b6a82 100644 --- a/src/lineCache.ts +++ b/src/lineCache.ts @@ -50,5 +50,5 @@ function doesLineEndInOperator(text: string) { const endingOperatorIndex = text.search(/(,|\+|!|\$|\^|&|\*|-|=|:|\'|~|\||\/|\?|%.*%)(\s*|\s*\#.*)$/); const spacesOnlyIndex = text.search(/^\s*$/); - return ((0 <= endingOperatorIndex) || (0 <= spacesOnlyIndex)); + return ((endingOperatorIndex >= 0) || (spacesOnlyIndex >= 0)); } diff --git a/src/preview.ts b/src/preview.ts index 322e53ad6..fdb1ebc4d 100644 --- a/src/preview.ts +++ b/src/preview.ts @@ -1,6 +1,6 @@ "use strict"; -import fs = require("fs-extra"); +import { existsSync, mkdirSync, removeSync, statSync } from "fs-extra"; import { commands, extensions, window, workspace } from "vscode"; import { chooseTerminalAndSendText } from "./rTerminal"; @@ -54,7 +54,7 @@ async function openTmpCSV(pathToTmpCsv: string, tmpDir: string) { if (!checkIfFileExists(pathToTmpCsv)) { window.showErrorMessage("Dataframe failed to display."); - fs.removeSync(tmpDir); + removeSync(tmpDir); return false; } @@ -63,7 +63,7 @@ async function openTmpCSV(pathToTmpCsv: string, tmpDir: string) { const success = await waitForFileToFinish(pathToTmpCsv); if (!success) { window.showWarningMessage("Visual Studio Code currently limits opening files to 20 MB."); - fs.removeSync(tmpDir); + removeSync(tmpDir); return false; } @@ -74,23 +74,24 @@ async function openTmpCSV(pathToTmpCsv: string, tmpDir: string) { } // Open CSV in Excel Viewer and clean up. - workspace.openTextDocument(pathToTmpCsv).then(async (file) => { - await commands.executeCommand("csv.preview", file.uri); - fs.removeSync(tmpDir); + workspace.openTextDocument(pathToTmpCsv) + .then(async (file) => { + await commands.executeCommand("csv.preview", file.uri); + removeSync(tmpDir); }); } -async function waitForFileToFinish(filePath) { +async function waitForFileToFinish(filePath: string) { const fileBusy = true; let currentSize = 0; let previousSize = 1; while (fileBusy) { - const stats = fs.statSync(filePath); + const stats = statSync(filePath); currentSize = stats.size; // UPDATE: We are now limited to 20 mb by MODEL_TOKENIZATION_LIMIT - // https://github.com/Microsoft/vscode/blob/master/src/vs/editor/common/model/textModel.ts#L34 + // Https://github.com/Microsoft/vscode/blob/master/src/vs/editor/common/model/textModel.ts#L34 if (currentSize > 2 * 10000000) { // 20 MB return false; } @@ -111,8 +112,8 @@ function makeTmpDir() { } else { tmpDir += "/.tmp"; } - if (!fs.existsSync(tmpDir)) { - fs.mkdirSync(tmpDir); + if (!existsSync(tmpDir)) { + mkdirSync(tmpDir); } return tmpDir; @@ -120,11 +121,12 @@ function makeTmpDir() { function checkcsv() { const iscsv = extensions.getExtension("GrapeCity.gc-excelviewer"); - if (iscsv && iscsv.isActive) { + if (iscsv !== undefined && iscsv.isActive) { return true; } window.showInformationMessage("This function need to install `GrapeCity.gc-excelviewer`, will you install?", - "Yes", "No").then((select) => { + "Yes", "No") + .then((select) => { if (select === "Yes") { commands.executeCommand("workbench.extensions.installExtension", "GrapeCity.gc-excelviewer"); } diff --git a/src/rGitignore.ts b/src/rGitignore.ts index 7594d1607..da0a7b1b2 100644 --- a/src/rGitignore.ts +++ b/src/rGitignore.ts @@ -1,32 +1,33 @@ "use strict"; -import fs = require("fs-extra"); -import path = require("path"); +import { writeFile } from "fs-extra"; +import { join } from "path"; import { window, workspace } from "vscode"; // From "https://github.com/github/gitignore/raw/master/R.gitignore" const ignoreFiles = [".Rhistory", - ".Rapp.history", - ".RData", - "*-Ex.R", - "/*.tar.gz", - "/*.Rcheck/", - ".Rproj.user/", - "vignettes/*.html", - "vignettes/*.pdf", - ".httr-oauth", - "/*_cache/", - "/cache/", - "*.utf8.md", - "*.knit.md", - "rsconnect/"].join("\n"); + ".Rapp.history", + ".RData", + "*-Ex.R", + "/*.tar.gz", + "/*.Rcheck/", + ".Rproj.user/", + "vignettes/*.html", + "vignettes/*.pdf", + ".httr-oauth", + "/*_cache/", + "/cache/", + "*.utf8.md", + "*.knit.md", + "rsconnect/"].join("\n"); export function createGitignore() { if (!workspace.workspaceFolders[0].uri.path) { window.showWarningMessage("Please open workspace to create .gitignore"); + return; } - const ignorePath = path.join(workspace.workspaceFolders[0].uri.path, ".gitignore"); - fs.writeFile(ignorePath, ignoreFiles, (err) => { + const ignorePath = join(workspace.workspaceFolders[0].uri.path, ".gitignore"); + writeFile(ignorePath, ignoreFiles, (err) => { try { if (err) { window.showErrorMessage(err.name); diff --git a/src/rTerminal.ts b/src/rTerminal.ts index 4541a4c10..6be4bce73 100644 --- a/src/rTerminal.ts +++ b/src/rTerminal.ts @@ -1,6 +1,6 @@ "use strict"; -import fs = require("fs-extra"); +import { pathExists } from "fs-extra"; import { isDeepStrictEqual } from "util"; import { commands, Terminal, window } from "vscode"; @@ -11,11 +11,11 @@ export let rTerm: Terminal; export function createRTerm(preserveshow?: boolean): boolean { const termName = "R Interactive"; const termPath = getRpath(); - if (!termPath) { - return; + if (termPath === undefined) { + return undefined; } const termOpt: string[] = config.get("rterm.option"); - fs.pathExists(termPath, (err, exists) => { + pathExists(termPath, (err, exists) => { if (exists) { rTerm = window.createTerminal(termName, termPath, termOpt); rTerm.show(preserveshow); @@ -46,17 +46,17 @@ export async function chooseTerminal(active: boolean = false) { } if (window.terminals.length > 0) { - const RTermNameOpinions = ["R", "R Interactive"]; + const rTermNameOpinions = ["R", "R Interactive"]; if (window.activeTerminal) { const activeTerminalName = window.activeTerminal.name; - if (RTermNameOpinions.includes(activeTerminalName)) { + if (rTermNameOpinions.includes(activeTerminalName)) { return window.activeTerminal; } } else { // Creating a terminal when there aren't any already does not seem to set activeTerminal if (window.terminals.length === 1) { const activeTerminalName = window.terminals[0].name; - if (RTermNameOpinions.includes(activeTerminalName)) { + if (rTermNameOpinions.includes(activeTerminalName)) { return window.terminals[0]; } } else { @@ -68,7 +68,7 @@ export async function chooseTerminal(active: boolean = false) { } } - if (!rTerm) { + if (rTerm === undefined) { const success = createRTerm(true); await delay(200); // Let RTerm warm up if (!success) { @@ -79,7 +79,7 @@ export async function chooseTerminal(active: boolean = false) { return rTerm; } -export async function runSelectionInTerm(term: Terminal) { +export function runSelectionInTerm(term: Terminal) { const selection = getSelection(); if (selection.linesDownToMoveCursor > 0) { commands.executeCommand("cursorMove", { to: "down", value: selection.linesDownToMoveCursor }); @@ -89,9 +89,9 @@ export async function runSelectionInTerm(term: Terminal) { } export async function runTextInTerm(term: Terminal, textArray: string[]) { - if (textArray.length > 1 && config.get("bracketedPaste")) { + if (textArray.length > 1 && config.get("bracketedPaste")) { // Surround with ANSI control characters for bracketed paste mode - textArray[0] = "\x1b[200~" + textArray[0]; + textArray[0] = `\x1b[200~${textArray[0]}`; textArray[textArray.length - 1] += "\x1b[201~"; } diff --git a/src/selection.ts b/src/selection.ts index c80e060a1..60ed4a7a0 100644 --- a/src/selection.ts +++ b/src/selection.ts @@ -1,6 +1,7 @@ "use strict"; -import { Position, Range, window} from "vscode"; +import { Position, Range, window } from "vscode"; + import { LineCache } from "./lineCache"; export function getWordOrSelection() { @@ -14,6 +15,7 @@ export function getWordOrSelection() { } else { text = currentDocument.getText(window.activeTextEditor.selection); } + return text.split("\n"); } @@ -21,16 +23,17 @@ export function surroundSelection(textArray: string[], rFunctionName: string[]) if (rFunctionName && rFunctionName.length) { let rFunctionCall = ""; for (const feature of rFunctionName) { - rFunctionCall += feature + "("; + rFunctionCall += `${feature}(`; } textArray[0] = rFunctionCall + textArray[0].trimLeft(); const end = textArray.length - 1; textArray[end] = textArray[end].trimRight() + ")".repeat(rFunctionName.length); } + return textArray; } -export function getSelection(): any { +export function getSelection() { const selection = { linesDownToMoveCursor: 0, selectedTextArray: [] }; const { start, end } = window.activeTextEditor.selection; const currentDocument = window.activeTextEditor.document; @@ -43,11 +46,12 @@ export function getSelection(): any { const charactersOnLine = window.activeTextEditor.document.lineAt(endLine).text.length; const newStart = new Position(startLine, 0); const newEnd = new Position(endLine, charactersOnLine); - selection.linesDownToMoveCursor = 1 + endLine - start.line; + selection.linesDownToMoveCursor = endLine + 1 - start.line; selectedLine = currentDocument.getText(new Range(newStart, newEnd)); } else if (start.line === end.line) { selection.linesDownToMoveCursor = 0; selection.selectedTextArray = [currentDocument.getText(new Range(start, end))]; + return selection; } else { selectedLine = currentDocument.getText(new Range(start, end)); @@ -64,6 +68,7 @@ function removeCommentedLines(selection: string[]): string[] { selection.forEach((line) => { if (!checkForBlankOrComment(line)) { selectionWithoutComments.push(line); } }); + return selectionWithoutComments; } @@ -75,8 +80,9 @@ export function checkForBlankOrComment(line: string): boolean { isWhitespaceOnly = false; break; } - index++; + index += 1; } + return isWhitespaceOnly || line[index] === "#"; } @@ -85,9 +91,9 @@ export function checkForBlankOrComment(line: string): boolean { */ class PositionNeg { public line: number; - public character; + public character: number; public cter: number; - constructor(line: number, character: number) { + public constructor(line: number, character: number) { this.line = line; this.character = character; } @@ -95,15 +101,16 @@ class PositionNeg { function doBracketsMatch(a: string, b: string): boolean { const matches = { "(": ")", "[": "]", "{": "}", ")": "(", "]": "[", "}": "{" }; + return matches[a] === b; } function isBracket(c: string, lookingForward: boolean) { if (lookingForward) { return ((c === "(") || (c === "[") || (c === "{")); - } else { - return ((c === ")") || (c === "]") || (c === "}")); } + + return ((c === ")") || (c === "]") || (c === "}")); } /** @@ -120,9 +127,9 @@ function getNextChar(p: PositionNeg, lookingForward: boolean, getLine: (x: number) => string, getEndsInOperator: (y: number) => boolean, - lineCount) { + lineCount: number) { const s = getLine(p.line); - let nextPos: PositionNeg = null; + let nextPos: PositionNeg; let isEndOfCodeLine = false; let isEndOfFile = false; if (lookingForward) { @@ -158,6 +165,7 @@ function getNextChar(p: PositionNeg, } } const nextChar = getLine(nextPos.line)[nextPos.character]; + return ({ nextChar, nextPos, isEndOfCodeLine, isEndOfFile }); } @@ -201,8 +209,8 @@ export function extendSelection(line: number, getLine: (line: number) => string, const getLineFromCache = (x) => lc.getLineFromCache(x); const getEndsInOperatorFromCache = (x) => lc.getEndsInOperatorFromCache(x); let lookingForward = true; - // poss[1] is the farthest point reached looking forward from line, - // and poss[0] is the farthest point reached looking backward from line. + /* poss[1] is the farthest point reached looking forward from line, + and poss[0] is the farthest point reached looking backward from line. */ const poss = { 0: new PositionNeg(line, 0), 1: new PositionNeg(line, -1) }; const flagsFinish = { 0: false, 1: false }; // 1 represents looking forward, 0 represents looking back. let flagAbort = false; @@ -214,24 +222,21 @@ export function extendSelection(line: number, getLine: (line: number) => string, getLineFromCache, getEndsInOperatorFromCache, lineCount); - poss[lookingForward ? 1 : 0] = nextPos; + poss[Number(lookingForward)] = nextPos; if (isBracket(nextChar, lookingForward)) { unmatched[lookingForward ? 1 : 0].push(nextChar); } else if (isBracket(nextChar, !lookingForward)) { if (unmatched[lookingForward ? 1 : 0].length === 0) { lookingForward = !lookingForward; unmatched[lookingForward ? 1 : 0].push(nextChar); - flagsFinish[lookingForward ? 1 : 0] = false; - } else { - const needsToMatch = unmatched[lookingForward ? 1 : 0].pop(); - if (!doBracketsMatch(nextChar, needsToMatch)) { - flagAbort = true; - } + flagsFinish[Number(lookingForward)] = false; + } else if (!doBracketsMatch(nextChar, unmatched[lookingForward ? 1 : 0].pop())) { + flagAbort = true; } } else if (isEndOfCodeLine) { if (unmatched[lookingForward ? 1 : 0].length === 0) { // We have found everything we need to in this direction. Continue looking in the other direction. - flagsFinish[lookingForward ? 1 : 0] = true; + flagsFinish[Number(lookingForward)] = true; lookingForward = !lookingForward; } else if (isEndOfFile) { // Have hit the start or end of the file without finding the matching bracket. @@ -241,7 +246,7 @@ export function extendSelection(line: number, getLine: (line: number) => string, } if (flagAbort) { return ({ startLine: line, endLine: line }); - } else { - return ({ startLine: poss[0].line, endLine: poss[1].line }); } + + return ({ startLine: poss[0].line, endLine: poss[1].line }); } diff --git a/src/util.ts b/src/util.ts index b1361ea93..b8271291a 100644 --- a/src/util.ts +++ b/src/util.ts @@ -1,29 +1,32 @@ "use strict"; -import fs = require("fs-extra"); -import { window, workspace} from "vscode"; +import { existsSync } from "fs-extra"; +import { window, workspace } from "vscode"; export let config = workspace.getConfiguration("r"); export function getRpath() { if (process.platform === "win32") { - return config.get("rterm.windows") as string; - } else if (process.platform === "darwin") { - return config.get("rterm.mac") as string; - } else if ( process.platform === "linux") { - return config.get("rterm.linux") as string; - } else { - window.showErrorMessage(process.platform + " can't use R"); - return ""; + return config.get("rterm.windows"); } + if (process.platform === "darwin") { + return config.get("rterm.mac"); + } + if (process.platform === "linux") { + return config.get("rterm.linux"); + } + window.showErrorMessage(`${process.platform} can't use R`); + + return undefined; } export function ToRStringLiteral(s: string, quote: string) { if (s === undefined) { return "NULL"; } + return (quote + s.replace(/\\/g, "\\\\") - .replace(/"""/g, "\\" + quote) + .replace(/"""/g, `\\${quote}`) .replace(/\\n/g, "\\n") .replace(/\\r/g, "\\r") .replace(/\\t/g, "\\t") @@ -38,10 +41,10 @@ export function delay(ms: number) { return new Promise((resolve) => setTimeout(resolve, ms)); } -export function checkForSpecialCharacters(text) { +export function checkForSpecialCharacters(text: string) { return !/[~`!#$%\^&*+=\-\[\]\\';,/{}|\\":<>\?\s]/g.test(text); } -export function checkIfFileExists(filePath) { - return fs.existsSync(filePath); +export function checkIfFileExists(filePath: string) { + return existsSync(filePath); } diff --git a/src/viewer.ts b/src/viewer.ts index 0103d31b3..23c5d1eb5 100644 --- a/src/viewer.ts +++ b/src/viewer.ts @@ -1,6 +1,6 @@ "use strict"; -import {commands, ExtensionContext, ViewColumn, window} from "vscode"; +import { commands, ExtensionContext, ViewColumn, window } from "vscode"; export function activate(context: ExtensionContext) { context.subscriptions.push(commands.registerCommand("catCoding.start", () => { From 91a31ca9c7bf9a1f7d3812a4f67272705b0c37bc Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Sat, 9 Nov 2019 16:20:19 +0900 Subject: [PATCH 009/795] Delete LICENSE --- LICENSE | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 9b14597d8..000000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Yuki Ueda - -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. From cdd630a7ca9f83cb9db37acc2172f91fdeafc5de Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Sat, 9 Nov 2019 16:22:03 +0900 Subject: [PATCH 010/795] Create LICENSE --- LICENSE | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..0ad25db4b --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. From 6a610bf1d6dff947ba3f380abf4435355d751a29 Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Sat, 9 Nov 2019 16:24:32 +0900 Subject: [PATCH 011/795] version 1.1.8 --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e719f73b3..9c9ce11f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 1.1.8 + +* Use word under cursor for previewDataframe, nrow (fix #137) +* Change license MIT -> AGPL-3.0 + ## 1.1.6 * Fix behaviour when workplacefolders is Undefiend (thankyou @masterhands) diff --git a/package.json b/package.json index 56b29569a..1522d8c61 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "r", "displayName": "R", "description": "Support for R language(run,syntax,snippet)", - "version": "1.1.7", + "version": "1.1.8", "author": "Yuki Ueda", "license": "SEE LICENSE IN LICENSE", "publisher": "Ikuyadeu", From 46b595a766f5f530c8f8305ab4ec2035a671c132 Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Sat, 9 Nov 2019 16:25:56 +0900 Subject: [PATCH 012/795] version 1.1.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1522d8c61..2cdb5a532 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "R Markdown" ], "engines": { - "vscode": "^1.29.0" + "vscode": "^1.40.0" }, "activationEvents": [ "onLanguage:r", From d8b8ccfd084a9c6320a8fba3262df39fd1639da7 Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Mon, 18 Nov 2019 10:56:29 +0900 Subject: [PATCH 013/795] Delete LICENSE --- LICENSE | 661 -------------------------------------------------------- 1 file changed, 661 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 0ad25db4b..000000000 --- a/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. From 13b5a699ce70e35cc6feb556036cb44079d35361 Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Mon, 18 Nov 2019 10:57:06 +0900 Subject: [PATCH 014/795] fix LICENSE to MIT --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..92086e4c9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 Yuki Ueda + +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. From f0b91b092f5cf62f1a8084aaab87ea43d58d04f2 Mon Sep 17 00:00:00 2001 From: Andrew Craig Date: Wed, 27 Nov 2019 21:12:57 +0900 Subject: [PATCH 015/795] Send code all at once in bracketed paste mode --- src/rTerminal.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/rTerminal.ts b/src/rTerminal.ts index 6be4bce73..24eaa1fab 100644 --- a/src/rTerminal.ts +++ b/src/rTerminal.ts @@ -93,11 +93,12 @@ export async function runTextInTerm(term: Terminal, textArray: string[]) { // Surround with ANSI control characters for bracketed paste mode textArray[0] = `\x1b[200~${textArray[0]}`; textArray[textArray.length - 1] += "\x1b[201~"; - } - - for (const line of textArray) { - await delay(8); // Increase delay if RTerm can't handle speed. - term.sendText(line); + term.sendText(textArray.join("\n")); + } else { + for (const line of textArray) { + await delay(8); // Increase delay if RTerm can't handle speed. + term.sendText(line); + } } setFocus(term); } From 519b8046d22cf57f787c9d36778abd9502b0af91 Mon Sep 17 00:00:00 2001 From: Andrew Craig Date: Wed, 27 Nov 2019 21:14:11 +0900 Subject: [PATCH 016/795] Use no bracketed paste characters on Windows --- src/rTerminal.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/rTerminal.ts b/src/rTerminal.ts index 24eaa1fab..1c94dc18c 100644 --- a/src/rTerminal.ts +++ b/src/rTerminal.ts @@ -90,9 +90,11 @@ export function runSelectionInTerm(term: Terminal) { export async function runTextInTerm(term: Terminal, textArray: string[]) { if (textArray.length > 1 && config.get("bracketedPaste")) { - // Surround with ANSI control characters for bracketed paste mode - textArray[0] = `\x1b[200~${textArray[0]}`; - textArray[textArray.length - 1] += "\x1b[201~"; + if (process.platform !== "win32") { + // Surround with ANSI control characters for bracketed paste mode + textArray[0] = `\x1b[200~${textArray[0]}`; + textArray[textArray.length - 1] += "\x1b[201~"; + } term.sendText(textArray.join("\n")); } else { for (const line of textArray) { From bc79e9245682ee09b4f0b742b927a37702d91b82 Mon Sep 17 00:00:00 2001 From: Kien Dang Date: Wed, 11 Dec 2019 16:55:04 +0800 Subject: [PATCH 017/795] Fix function call closing bracket highlight --- syntax/r.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/r.json b/syntax/r.json index e6d3121e4..48c27a5f6 100644 --- a/syntax/r.json +++ b/syntax/r.json @@ -423,7 +423,7 @@ "end": "(\\))", "endCaptures": { "1": { - "name": "punctuation.definition.parameters.r" + "name": "punctuation.section.parens.end.r" } }, "name": "meta.function-call.r", From 437b337983722823ee218c0543f652ba748b16f0 Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Sat, 14 Dec 2019 15:00:03 +0900 Subject: [PATCH 018/795] fix vlunerable packages --- package-lock.json | 212 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 105 insertions(+), 109 deletions(-) diff --git a/package-lock.json b/package-lock.json index 734e0040b..12765941e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "r", - "version": "1.1.7", + "version": "1.1.8", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -240,15 +240,15 @@ "dev": true }, "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", + "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==", "dev": true }, "ajv": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", - "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -581,9 +581,9 @@ "dev": true }, "bluebird": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", - "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==", + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "dev": true }, "bn.js": { @@ -738,9 +738,9 @@ } }, "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", + "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", "dev": true, "requires": { "base64-js": "^1.0.2", @@ -804,9 +804,9 @@ }, "dependencies": { "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -827,9 +827,9 @@ } }, "yallist": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.0.tgz", - "integrity": "sha512-6gpP93MR+VOOehKbCPchro3wFZNSNmek8A2kbkOAZLIZAYx1KP/zAqwO0sOHi3xJEb+UBz8NaYt/17UNit1Q9w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true } } @@ -1195,13 +1195,10 @@ } }, "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "dev": true, - "requires": { - "date-now": "^0.1.4" - } + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true }, "constants-browserify": { "version": "1.0.0", @@ -1332,12 +1329,6 @@ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=", "dev": true }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", - "dev": true - }, "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", @@ -1416,9 +1407,9 @@ } }, "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", + "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", "dev": true, "requires": { "inherits": "^2.0.1", @@ -1514,9 +1505,9 @@ } }, "elliptic": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz", - "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz", + "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==", "dev": true, "requires": { "bn.js": "^4.4.0", @@ -2166,9 +2157,9 @@ "dev": true }, "fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.10.tgz", + "integrity": "sha512-Dw5DScF/8AWhWzWRbnQrFJfeR/TOJZjRr9Du9kfmd8t234ICcVeDBlauFl/jVcE5ZewhlPoCFvIqp0SE3kAVxA==", "dev": true, "optional": true, "requires": { @@ -2221,7 +2212,7 @@ } }, "chownr": { - "version": "1.1.1", + "version": "1.1.3", "bundled": true, "dev": true, "optional": true @@ -2251,7 +2242,7 @@ "optional": true }, "debug": { - "version": "4.1.1", + "version": "3.2.6", "bundled": true, "dev": true, "optional": true, @@ -2278,12 +2269,12 @@ "optional": true }, "fs-minipass": { - "version": "1.2.5", + "version": "1.2.7", "bundled": true, "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.6.0" } }, "fs.realpath": { @@ -2309,7 +2300,7 @@ } }, "glob": { - "version": "7.1.3", + "version": "7.1.6", "bundled": true, "dev": true, "optional": true, @@ -2338,7 +2329,7 @@ } }, "ignore-walk": { - "version": "3.0.1", + "version": "3.0.3", "bundled": true, "dev": true, "optional": true, @@ -2357,7 +2348,7 @@ } }, "inherits": { - "version": "2.0.3", + "version": "2.0.4", "bundled": true, "dev": true, "optional": true @@ -2399,7 +2390,7 @@ "optional": true }, "minipass": { - "version": "2.3.5", + "version": "2.9.0", "bundled": true, "dev": true, "optional": true, @@ -2409,12 +2400,12 @@ } }, "minizlib": { - "version": "1.2.1", + "version": "1.3.3", "bundled": true, "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.9.0" } }, "mkdirp": { @@ -2427,18 +2418,18 @@ } }, "ms": { - "version": "2.1.1", + "version": "2.1.2", "bundled": true, "dev": true, "optional": true }, "needle": { - "version": "2.3.0", + "version": "2.4.0", "bundled": true, "dev": true, "optional": true, "requires": { - "debug": "^4.1.0", + "debug": "^3.2.6", "iconv-lite": "^0.4.4", "sax": "^1.2.4" } @@ -2472,13 +2463,22 @@ } }, "npm-bundled": { - "version": "1.0.6", + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", "bundled": true, "dev": true, "optional": true }, "npm-packlist": { - "version": "1.4.1", + "version": "1.4.7", "bundled": true, "dev": true, "optional": true, @@ -2549,7 +2549,7 @@ "optional": true }, "process-nextick-args": { - "version": "2.0.0", + "version": "2.0.1", "bundled": true, "dev": true, "optional": true @@ -2590,7 +2590,7 @@ } }, "rimraf": { - "version": "2.6.3", + "version": "2.7.1", "bundled": true, "dev": true, "optional": true, @@ -2617,7 +2617,7 @@ "optional": true }, "semver": { - "version": "5.7.0", + "version": "5.7.1", "bundled": true, "dev": true, "optional": true @@ -2670,18 +2670,18 @@ "optional": true }, "tar": { - "version": "4.4.8", + "version": "4.4.13", "bundled": true, "dev": true, "optional": true, "requires": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", "mkdirp": "^0.5.0", "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "yallist": "^3.0.3" } }, "util-deprecate": { @@ -2706,7 +2706,7 @@ "optional": true }, "yallist": { - "version": "3.0.3", + "version": "3.1.1", "bundled": true, "dev": true, "optional": true @@ -4927,9 +4927,9 @@ } }, "serialize-javascript": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz", - "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz", + "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==", "dev": true }, "set-blocking": { @@ -5145,6 +5145,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz", + "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -5294,9 +5312,9 @@ } }, "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", + "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", "dev": true }, "string-width": { @@ -5381,9 +5399,9 @@ } }, "terser": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.4.tgz", - "integrity": "sha512-Kcrn3RiW8NtHBP0ssOAzwa2MsIRQ8lJWiBG/K7JgqPlomA3mtb2DEmp4/hrUA+Jujx+WZ02zqd7GYD+QRBB/2Q==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.2.tgz", + "integrity": "sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ==", "dev": true, "requires": { "commander": "^2.20.0", @@ -5392,9 +5410,9 @@ }, "dependencies": { "commander": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.1.tgz", - "integrity": "sha512-cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, "source-map": { @@ -5402,30 +5420,20 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } } } }, "terser-webpack-plugin": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz", - "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz", + "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==", "dev": true, "requires": { "cacache": "^12.0.2", "find-cache-dir": "^2.1.0", "is-wsl": "^1.1.0", "schema-utils": "^1.0.0", - "serialize-javascript": "^1.7.0", + "serialize-javascript": "^2.1.2", "source-map": "^0.6.1", "terser": "^4.1.2", "webpack-sources": "^1.4.0", @@ -5779,9 +5787,9 @@ "dev": true }, "vm-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz", - "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", "dev": true }, "watchpack": { @@ -5796,9 +5804,9 @@ } }, "webpack": { - "version": "4.41.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.0.tgz", - "integrity": "sha512-yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g==", + "version": "4.41.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz", + "integrity": "sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==", "dev": true, "requires": { "@webassemblyjs/ast": "1.8.5", @@ -5826,18 +5834,6 @@ "webpack-sources": "^1.4.1" }, "dependencies": { - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "braces": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", diff --git a/package.json b/package.json index 2cdb5a532..b2e05deae 100644 --- a/package.json +++ b/package.json @@ -384,7 +384,7 @@ "ts-loader": "^6.2.0", "tslint": "^5.20.1", "typescript": "^3.6.3", - "webpack": "^4.41.0", + "webpack": "^4.41.2", "webpack-cli": "^3.3.9", "yamljs": "^0.3.0" }, From 504c89dcbf1a8765a5cbcbabfacc4c15f87823ab Mon Sep 17 00:00:00 2001 From: Yuki Ueda Date: Sun, 15 Dec 2019 16:21:31 +0900 Subject: [PATCH 019/795] version 1.1.9 --- CHANGELOG.md | 7 ++++++- package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c9ce11f3..a18f0ca8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 1.1.9 + +* Fix bracketed paste on Windows (fix #117) +* Fix function call closing bracket highlight (Thank you @kiendang) + ## 1.1.8 * Use word under cursor for previewDataframe, nrow (fix #137) @@ -7,7 +12,7 @@ ## 1.1.6 -* Fix behaviour when workplacefolders is Undefiend (thankyou @masterhands) +* Fix behaviour when workplacefolders is Undefiend (Thank you @masterhands) * Show r.term.option value in settings UI * Refactoring diff --git a/package.json b/package.json index b2e05deae..77970c1d1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "r", "displayName": "R", "description": "Support for R language(run,syntax,snippet)", - "version": "1.1.8", + "version": "1.1.9", "author": "Yuki Ueda", "license": "SEE LICENSE IN LICENSE", "publisher": "Ikuyadeu", From 652c4dace9249cddf56e0be832f53a3fdd1a4332 Mon Sep 17 00:00:00 2001 From: Andrew Craig Date: Wed, 6 Nov 2019 21:24:32 +0900 Subject: [PATCH 020/795] Hover works with update --- package.json | 5 +++++ src/extension.ts | 16 +++++++++++++++- src/session.ts | 30 ++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/session.ts diff --git a/package.json b/package.json index 77970c1d1..996dc6f4f 100644 --- a/package.json +++ b/package.json @@ -232,6 +232,11 @@ "title": "Document", "category": "R", "command": "r.document" + }, + { + "title": "Start Session", + "category": "R", + "command": "r.sessionStart" } ], "keybindings": [ diff --git a/src/extension.ts b/src/extension.ts index 96aea0842..0de9cfe1d 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -2,13 +2,14 @@ // The module 'vscode' contains the VS Code extensibility API // Import the module and reference it with the alias vscode in your code below import { commands, CompletionItem, ExtensionContext, IndentAction, - languages, Position, TextDocument, window } from "vscode"; + languages, Position, TextDocument, window, Hover } from "vscode"; import { previewDataframe, previewEnvironment } from "./preview"; import { createGitignore } from "./rGitignore"; import { chooseTerminal, chooseTerminalAndSendText, createRTerm, deleteTerminal, runSelectionInTerm, runTextInTerm } from "./rTerminal"; import { getWordOrSelection, surroundSelection } from "./selection"; +import { globalenv, sessionStart } from "./session"; import { config, ToRStringLiteral } from "./util"; const wordPattern = /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\<\>\/\s]+)/g; @@ -91,6 +92,10 @@ export function activate(context: ExtensionContext) { runTextInTerm(callableTerminal, wrappedText); } + function callSessionStart() { + sessionStart(); + } + languages.registerCompletionItemProvider("r", { provideCompletionItems(document: TextDocument, position: Position) { if (document.lineAt(position).text @@ -102,6 +107,14 @@ export function activate(context: ExtensionContext) { }, }, "@"); // Trigger on '@' + languages.registerHoverProvider("r", { + provideHover(document, position, token) { + const wordRange = document.getWordRangeAtPosition(position); + const text = document.getText(wordRange); + return new Hover("VALUE: " + globalenv[text].str); + } + }); + languages.setLanguageConfiguration("r", { onEnterRules: [{ // Automatically continue roxygen comments: #' action: { indentAction: IndentAction.None, appendText: "#' " }, @@ -133,6 +146,7 @@ export function activate(context: ExtensionContext) { commands.registerCommand("r.install", () => chooseTerminalAndSendText("devtools::install()")), commands.registerCommand("r.build", () => chooseTerminalAndSendText("devtools::build()")), commands.registerCommand("r.document", () => chooseTerminalAndSendText("devtools::document()")), + commands.registerCommand("r.sessionStart", callSessionStart), window.onDidCloseTerminal(deleteTerminal), ); } diff --git a/src/session.ts b/src/session.ts new file mode 100644 index 000000000..e4adbe401 --- /dev/null +++ b/src/session.ts @@ -0,0 +1,30 @@ +"use strict"; + +import fs = require("fs-extra"); +import { window, workspace, RelativePattern } from "vscode"; + +export let globalenv: any; + +function updateGlobalenv(event) { + const globalenvPath = workspace.rootPath + "/.vscode-R/session/PID/globalenv.json"; + const parseResult = JSON.parse(fs.readFileSync(globalenvPath, "utf8")); + globalenv = parseResult; + window.showInformationMessage("parseResult.a: " + parseResult['a'].str); + window.showInformationMessage("Updated globalenv.a: " + globalenv['a'].str); +} + +export function sessionStart() { + //TODO Make async? + //TODO Specify location of .vscode-R + const uri = window.activeTextEditor!.document.uri; + const globalenvPath = workspace.rootPath + "/.vscode-R/session/PID/globalenv.json"; + window.showInformationMessage("Path: " + globalenvPath); + globalenv = JSON.parse(fs.readFileSync(globalenvPath, "utf8")); + window.showInformationMessage("Probably loaded globalenv" + globalenv['a'].str); + const fileWatcher = workspace.createFileSystemWatcher( + new RelativePattern( + workspace.getWorkspaceFolder(uri)!, + ".vscode-R/session/PID/globalenv.json")); + fileWatcher.onDidChange(updateGlobalenv); + //TODO createFileSystemWatcher can only watch workspace +} From 9835e46c03399edae17e5477f01a2786d751da30 Mon Sep 17 00:00:00 2001 From: Andrew Craig Date: Tue, 12 Nov 2019 21:05:42 +0900 Subject: [PATCH 021/795] Attach active command switches session --- package.json | 4 +-- src/extension.ts | 8 ++---- src/session.ts | 64 ++++++++++++++++++++++++++++++++++++------------ 3 files changed, 53 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 996dc6f4f..a2aea5aee 100644 --- a/package.json +++ b/package.json @@ -234,9 +234,9 @@ "command": "r.document" }, { - "title": "Start Session", + "title": "Attach Active Terminal", "category": "R", - "command": "r.sessionStart" + "command": "r.attachActive" } ], "keybindings": [ diff --git a/src/extension.ts b/src/extension.ts index 0de9cfe1d..d0bb750f9 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -9,7 +9,7 @@ import { createGitignore } from "./rGitignore"; import { chooseTerminal, chooseTerminalAndSendText, createRTerm, deleteTerminal, runSelectionInTerm, runTextInTerm } from "./rTerminal"; import { getWordOrSelection, surroundSelection } from "./selection"; -import { globalenv, sessionStart } from "./session"; +import { attachActive, globalenv } from "./session"; import { config, ToRStringLiteral } from "./util"; const wordPattern = /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\<\>\/\s]+)/g; @@ -92,10 +92,6 @@ export function activate(context: ExtensionContext) { runTextInTerm(callableTerminal, wrappedText); } - function callSessionStart() { - sessionStart(); - } - languages.registerCompletionItemProvider("r", { provideCompletionItems(document: TextDocument, position: Position) { if (document.lineAt(position).text @@ -146,7 +142,7 @@ export function activate(context: ExtensionContext) { commands.registerCommand("r.install", () => chooseTerminalAndSendText("devtools::install()")), commands.registerCommand("r.build", () => chooseTerminalAndSendText("devtools::build()")), commands.registerCommand("r.document", () => chooseTerminalAndSendText("devtools::document()")), - commands.registerCommand("r.sessionStart", callSessionStart), + commands.registerCommand("r.attachActive", attachActive), window.onDidCloseTerminal(deleteTerminal), ); } diff --git a/src/session.ts b/src/session.ts index e4adbe401..d9406ea4c 100644 --- a/src/session.ts +++ b/src/session.ts @@ -1,30 +1,64 @@ "use strict"; import fs = require("fs-extra"); -import { window, workspace, RelativePattern } from "vscode"; +import { RelativePattern, window, workspace } from "vscode"; +import { chooseTerminalAndSendText } from "./rTerminal"; export let globalenv: any; +let sessionWatcher: any; +let PID: string; -function updateGlobalenv(event) { - const globalenvPath = workspace.rootPath + "/.vscode-R/session/PID/globalenv.json"; +export function attachActive() { + startLogWatcher(); + chooseTerminalAndSendText("getOption('vscodeR')$attach()"); +} + +function updateSessionWatcher() { + const uri = window.activeTextEditor!.document.uri; + window.showInformationMessage("Updating session to PID " + PID); + sessionWatcher = workspace.createFileSystemWatcher( + new RelativePattern( + workspace.getWorkspaceFolder(uri)!, + ".vscode/vscode-R/" + PID + "/globalenv.json")); + sessionWatcher.onDidChange(updateGlobalenv); +} + +function _updateGlobalenv() { + const globalenvPath = workspace.rootPath + "/.vscode/vscode-R/" + PID + "/globalenv.json"; const parseResult = JSON.parse(fs.readFileSync(globalenvPath, "utf8")); globalenv = parseResult; - window.showInformationMessage("parseResult.a: " + parseResult['a'].str); - window.showInformationMessage("Updated globalenv.a: " + globalenv['a'].str); + window.showInformationMessage("Updated globalenv"); +} + +function updateGlobalenv(event) { + _updateGlobalenv(); +} + +function updateResponse(event) { + window.showInformationMessage("Response file updated!"); + // Read last line from response file + const responseLogFile = workspace.rootPath + "/.vscode/vscode-R/response.log"; + window.showInformationMessage("File exists? " + fs.existsSync(responseLogFile)); + const lines = fs.readFileSync(responseLogFile, "utf8").split("\n"); + window.showInformationMessage("Read response file"); + const lastLine = lines[lines.length - 2]; + window.showInformationMessage("Last line: " + lastLine); + const parseResult = JSON.parse(lastLine); + if (parseResult.command === "attach") { + PID = parseResult.pid; + updateSessionWatcher(); + _updateGlobalenv(); + window.showInformationMessage("Got PID: " + PID); + } else { + window.showInformationMessage("Command was not attach"); + } } -export function sessionStart() { - //TODO Make async? - //TODO Specify location of .vscode-R +function startLogWatcher() { const uri = window.activeTextEditor!.document.uri; - const globalenvPath = workspace.rootPath + "/.vscode-R/session/PID/globalenv.json"; - window.showInformationMessage("Path: " + globalenvPath); - globalenv = JSON.parse(fs.readFileSync(globalenvPath, "utf8")); - window.showInformationMessage("Probably loaded globalenv" + globalenv['a'].str); const fileWatcher = workspace.createFileSystemWatcher( new RelativePattern( workspace.getWorkspaceFolder(uri)!, - ".vscode-R/session/PID/globalenv.json")); - fileWatcher.onDidChange(updateGlobalenv); - //TODO createFileSystemWatcher can only watch workspace + ".vscode/vscode-R/response.log")); + fileWatcher.onDidChange(updateResponse); } From b4976d5181e36ae4f8e05165df09a110cd4b98db Mon Sep 17 00:00:00 2001 From: Andrew Craig Date: Thu, 14 Nov 2019 21:15:05 +0900 Subject: [PATCH 022/795] Detects changes to plot --- src/session.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/session.ts b/src/session.ts index d9406ea4c..3dc20894c 100644 --- a/src/session.ts +++ b/src/session.ts @@ -21,6 +21,20 @@ function updateSessionWatcher() { workspace.getWorkspaceFolder(uri)!, ".vscode/vscode-R/" + PID + "/globalenv.json")); sessionWatcher.onDidChange(updateGlobalenv); + sessionWatcher = workspace.createFileSystemWatcher( + new RelativePattern( + workspace.getWorkspaceFolder(uri)!, + ".vscode/vscode-R/" + PID + "/plot.png")); + sessionWatcher.onDidChange(updatePlot); +} + +function _updatePlot() { + const plotPath = workspace.rootPath + "/.vscode/vscode-R/" + PID + "/plot.png"; + window.showInformationMessage("Updated plot"); +} + +function updatePlot(event) { + _updatePlot(); } function _updateGlobalenv() { @@ -48,6 +62,7 @@ function updateResponse(event) { PID = parseResult.pid; updateSessionWatcher(); _updateGlobalenv(); + _updatePlot(); window.showInformationMessage("Got PID: " + PID); } else { window.showInformationMessage("Command was not attach"); From 19e985a1a00311678a2db5e97a2be068952faac8 Mon Sep 17 00:00:00 2001 From: Kun Ren Date: Sat, 16 Nov 2019 22:56:42 +0800 Subject: [PATCH 023/795] First implementation of showWebView --- src/session.ts | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/session.ts b/src/session.ts index 3dc20894c..e82ad5f9d 100644 --- a/src/session.ts +++ b/src/session.ts @@ -1,7 +1,8 @@ "use strict"; import fs = require("fs-extra"); -import { RelativePattern, window, workspace } from "vscode"; +import { dirname } from "path"; +import { RelativePattern, window, workspace, ViewColumn, Uri } from "vscode"; import { chooseTerminalAndSendText } from "./rTerminal"; export let globalenv: any; @@ -48,6 +49,19 @@ function updateGlobalenv(event) { _updateGlobalenv(); } +function showWebView(file) { + const dir = dirname(file); + window.showInformationMessage("webview uri: " + file); + const panel = window.createWebviewPanel("webview", "WebView", ViewColumn.One, { + enableScripts: true, + localResourceRoots: [Uri.file(dir)] + }); + const html = fs.readFileSync(file).toString() + .replace(/ + + + + + + +`; +} + +async function getListHtml(file) { + var content = await fs.readFile(file); + return ` + + + + + + + + + + + + + + + 

+
+
+
+`;
+}
+
 async function updateResponse(event) {
     console.info("Response file updated!");
     // Read last line from response file
@@ -129,6 +240,8 @@ async function updateResponse(event) {
         _updatePlot();
     } else if (parseResult.command === "webview") {
         showWebView(parseResult.file);
+    } else if (parseResult.command === "dataview") {
+        showDataView(parseResult.source, parseResult.type, parseResult.title, parseResult.file);
     } else {
         console.info("Command was not attach");
     }

From 1bb4d5711e31bd63d8ec974b0a33a86fddd909fa Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Fri, 6 Dec 2019 18:20:27 +0800
Subject: [PATCH 045/795] Force color in showWebView

---
 src/session.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/session.ts b/src/session.ts
index c1e77a7ad..bf8e5e19a 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -106,6 +106,8 @@ async function showWebView(file) {
         });
     const content = await fs.readFile(file);
     const html = content.toString()
+        .replace("",
+            "")
         .replace(/
 
-
 
 `;
 }
 
 async function getListHtml(file) {
     var content = await fs.readFile(file);
-    return `
+    return `
+
 
-
 
   
   
   
   
-
   
-
   
 
-
 
   

 
-
 
 `;
 }

From cc22e16fa40b54d092aef294fdf8a7dffe6e4252 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Fri, 6 Dec 2019 20:49:33 +0800
Subject: [PATCH 047/795] Refine table font size

---
 src/session.ts | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/session.ts b/src/session.ts
index e666ca918..969e6b6eb 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -120,7 +120,7 @@ async function showDataView(source: string, type: string, title: string, file: s
             const panel = window.createWebviewPanel("dataview", title,
                 { preserveFocus: true, viewColumn: ViewColumn.Two },
                 {
-                    enableScripts: true, localResourceRoots: [Uri.file(dir)]
+                    enableScripts: true, localResourceRoots: [Uri.file(resDir), Uri.file(dir)]
                 });
             const content = await getDataFrameHtml(file);
             panel.webview.html = content;
@@ -132,7 +132,7 @@ async function showDataView(source: string, type: string, title: string, file: s
             const panel = window.createWebviewPanel("dataview", title,
                 { preserveFocus: true, viewColumn: ViewColumn.Two },
                 {
-                    enableScripts: true
+                    enableScripts: true, localResourceRoots: [Uri.file(resDir)]
                 });
             const content = await getListHtml(file);
             panel.webview.html = content;
@@ -152,16 +152,25 @@ function getDataFrameHtml(file) {
   
   
   
-  
-  
+  
+  
+  
 
 
   

     

   

-  
-  
-  
+  
+  
+  
   
+  
   
   
   ",
             "")
-        .replace(/
 
 
@@ -243,7 +243,7 @@ function getTableHtml(webview: Webview, file: string) {
 }
 
 async function getListHtml(webview: Webview, file: string) {
-    var content = await fs.readFile(file);
+    const content = await fs.readFile(file);
     return `
 
 

From 26e36c2e164c3694352385b5120d1557c71a934c Mon Sep 17 00:00:00 2001
From: Andrew Craig 
Date: Sat, 14 Dec 2019 21:17:43 +0900
Subject: [PATCH 061/795] Fix error message

---
 src/session.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/session.ts b/src/session.ts
index b281ef2d2..5bd74fd7e 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -309,6 +309,6 @@ async function updateResponse(event) {
         showDataView(parseResult.source,
             parseResult.type, parseResult.title, parseResult.file);
     } else {
-        console.info("Command was not attach");
+        console.info("Unrecognised command: ${parseResult.command}");
     }
 }

From 176896d29537201d5b69d5d4da7cc594d6262a33 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sun, 15 Dec 2019 08:47:32 +0800
Subject: [PATCH 062/795] Use json for View(data.frame)

---
 R/init.R                  | 51 +++++++++++++++++++++++---
 resources/js/jsonTable.js | 39 ++++++++++++++++++++
 src/session.ts            | 75 +++++++++++++++++++--------------------
 3 files changed, 123 insertions(+), 42 deletions(-)
 create mode 100644 resources/js/jsonTable.js

diff --git a/R/init.R b/R/init.R
index 27369c955..ec0973f9e 100644
--- a/R/init.R
+++ b/R/init.R
@@ -72,15 +72,58 @@ if (interactive() && !identical(Sys.getenv("RSTUDIO"), "1")) {
         respond("attach")
       }
 
+      table_to_json <- function(data) {
+        if (is.data.frame(data)) {
+          if (.row_names_info(data) > 0L) {
+            rownames <- rownames(data)
+            rownames(data) <- NULL
+            data <- cbind(` ` = rownames, data, stringsAsFactors = FALSE)
+          }
+          size <- dim(data)
+          colnames <- trimws(colnames(data))
+          colnames(data) <- NULL
+          types <- vapply(data, typeof, character(1L), USE.NAMES = FALSE)
+          isf <- vapply(data, is.factor, logical(1L))
+          types[isf] <- "character"
+          data <- vapply(data, function(x) {
+            trimws(format(x))
+          }, character(nrow(data)))
+        } else if (is.matrix(data)) {
+          if (is.factor(data)) {
+            data <- format(data)
+          }
+          types <- rep(typeof(data), ncol(data))
+          colnames <- colnames(data)
+          colnames(data) <- NULL
+          if (is.null(colnames)) {
+            colnames <- sprintf("(X%d)", seq_len(ncol(data)))
+          } else {
+            colnames <- trimws(colnames)
+          }
+          rownames <- rownames(data)
+          rownames(data) <- NULL
+          data <- trimws(format(data))
+          if (!is.null(rownames)) {
+            types <- c("character", types)
+            colnames <- c(" ", colnames)
+            data <- cbind(` ` = trimws(rownames), data)
+          }
+          size <- dim(data)
+        } else {
+          stop("data must be data.frame or matrix")
+        }
+        list(size = size, columns = colnames, types = types, data = data)
+      }
+
       dataview <- function(x, title, ...) {
         if (missing(title)) {
           title <- deparse(substitute(x))[[1]]
         }
         if (is.data.frame(x) || is.matrix(x)) {
-          html <- knitr::kable(x = x, format = "html", ...)
-          file <- tempfile(tmpdir = tempdir, fileext = ".html")
-          writeLines(html, file)
-          respond("dataview", source = "table", type = "html",
+          data <- table_to_json(x)
+          file <- tempfile(tmpdir = tempdir, fileext = ".json")
+          jsonlite::write_json(data, file, matrix = "columnmajor")
+          respond("dataview", source = "table", type = "json",
             title = title, file = file)
         } else if (is.list(x)) {
           file <- tempfile(tmpdir = tempdir, fileext = ".json")
diff --git a/resources/js/jsonTable.js b/resources/js/jsonTable.js
new file mode 100644
index 000000000..74129a1cf
--- /dev/null
+++ b/resources/js/jsonTable.js
@@ -0,0 +1,39 @@
+var jsonTable = jsonTable || {};
+
+jsonTable = {
+  init: function (data, options) {
+    options = options || {};
+    var container = options.container || "table-container";
+    var datatables_options = options.datatables_options || {};
+    var $table = $("
");
+    var $container = $("#" + container);
+    $container.empty().append($table);
+    var $tableHead = $("");
+    var $tableHeadRow = $("");
+    for (var colId = 0; colId < data.size[1]; colId++) {
+      var $tableHeadColumn = $("")
+        .text(data.columns[colId]);
+      if (data.types[colId] === "character") {
+        $tableHeadColumn.addClass("left");
+      }
+      $tableHeadRow.append($tableHeadColumn);
+    }
+    $tableHead.append($tableHeadRow);
+    $table.append($tableHead);
+    var $tableBody = $("");
+    for (var rowId = 0; rowId < data.size[0]; rowId++) {
+      var $tableBodyRow = $("");
+      for (var colId = 0; colId < data.size[1]; colId++) {
+        var $tableRowCell = $("")
+          .text(data.data[colId][rowId]);
+        if (data.types[colId] === "character") {
+          $tableRowCell.addClass("left");
+        }
+        $tableBodyRow.append($tableRowCell);
+      }
+      $tableBody.append($tableBodyRow);
+    }
+    $table.append($tableBody);
+    $table.DataTable(datatables_options);
+  }
+};
diff --git a/src/session.ts b/src/session.ts
index 5bd74fd7e..462790370 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -163,45 +163,37 @@ async function showWebView(file: string) {
 }
 
 async function showDataView(source: string, type: string, title: string, file: string) {
-    const dir = path.dirname(file);
     if (source === "table") {
-        if (type === "html") {
-            const panel = window.createWebviewPanel("dataview", title,
-                {
-                    preserveFocus: true,
-                    viewColumn: ViewColumn.Two,
-                },
-                {
-                    enableScripts: true,
-                    localResourceRoots: [Uri.file(resDir), Uri.file(dir)],
-                });
-            const content = getTableHtml(panel.webview, file);
-            panel.webview.html = content;
-        } else {
-            console.error("Unsupported type: " + type);
-        }
+        const panel = window.createWebviewPanel("dataview", title,
+            {
+                preserveFocus: true,
+                viewColumn: ViewColumn.Two,
+            },
+            {
+                enableScripts: true,
+                localResourceRoots: [Uri.file(resDir)],
+            });
+        const content = await getTableHtml(panel.webview, file);
+        panel.webview.html = content;
     } else if (source === "list") {
-        if (type === "json") {
-            const panel = window.createWebviewPanel("dataview", title,
-                {
-                    preserveFocus: true,
-                    viewColumn: ViewColumn.Two,
-                },
-                {
-                    enableScripts: true,
-                    localResourceRoots: [Uri.file(resDir)],
-                });
-            const content = await getListHtml(panel.webview, file);
-            panel.webview.html = content;
-        } else {
-            console.error("Unsupported type: " + type);
-        }
+        const panel = window.createWebviewPanel("dataview", title,
+            {
+                preserveFocus: true,
+                viewColumn: ViewColumn.Two,
+            },
+            {
+                enableScripts: true,
+                localResourceRoots: [Uri.file(resDir)],
+            });
+        const content = await getListHtml(panel.webview, file);
+        panel.webview.html = content;
     } else {
         console.error("Unsupported data source: " + source);
     }
 }
 
-function getTableHtml(webview: Webview, file: string) {
+async function getTableHtml(webview: Webview, file: string) {
+    const content = await fs.readFile(file);
     return `
 
 
@@ -218,6 +210,13 @@ function getTableHtml(webview: Webview, file: string) {
     table {
         font-size: 0.75em;
     }
+    table td,
+    table th {
+      text-align: right;
+    }
+    .left {
+      text-align: left;
+    }
   
 
 
@@ -227,15 +226,15 @@ function getTableHtml(webview: Webview, file: string) {
   
   
   
+  
   
 
 

From 690a5b89b21d5254d52f50f9f69da12b06282315 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sun, 15 Dec 2019 10:54:29 +0800
Subject: [PATCH 063/795] Refine table_to_json in init.R

---
 R/init.R | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/R/init.R b/R/init.R
index ec0973f9e..6363b4000 100644
--- a/R/init.R
+++ b/R/init.R
@@ -74,20 +74,25 @@ if (interactive() && !identical(Sys.getenv("RSTUDIO"), "1")) {
 
       table_to_json <- function(data) {
         if (is.data.frame(data)) {
+          colnames <- colnames(data)
+          if (is.null(colnames)) {
+            colnames <- sprintf("(X%d)", seq_len(ncol(data)))
+          } else {
+            colnames <- trimws(colnames)
+          }
           if (.row_names_info(data) > 0L) {
             rownames <- rownames(data)
             rownames(data) <- NULL
-            data <- cbind(` ` = rownames, data, stringsAsFactors = FALSE)
+            data <- cbind(rownames, data, stringsAsFactors = FALSE)
+            colnames <- c(" ", colnames)
           }
           size <- dim(data)
-          colnames <- trimws(colnames(data))
-          colnames(data) <- NULL
           types <- vapply(data, typeof, character(1L), USE.NAMES = FALSE)
-          isf <- vapply(data, is.factor, logical(1L))
+          isf <- vapply(data, is.factor, logical(1L), USE.NAMES = FALSE)
           types[isf] <- "character"
           data <- vapply(data, function(x) {
             trimws(format(x))
-          }, character(nrow(data)))
+          }, character(nrow(data)), USE.NAMES = FALSE)
         } else if (is.matrix(data)) {
           if (is.factor(data)) {
             data <- format(data)

From b8b607ba09e4707eaf29584765408c6f863b4392 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sun, 15 Dec 2019 11:35:48 +0800
Subject: [PATCH 064/795] Check windows in source script

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b61f16392..9dbb856f7 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ An opt-in experimental R session watcher is implemented to support the following
 To enable this feature, turn on `r.sessionWatcher` and append the following code to your `.Rprofile` (in your home directory):
 
 ```r
-source(file.path(Sys.getenv("HOME"), ".vscode-R", "init.R"))
+source(file.path(Sys.getenv(if (.Platform$OS.type == "windows") "HOMEPATH" else "HOME"), ".vscode-R", "init.R"))
 ```
 
 This script writes the metadata of symbols in the global environment to `${workspaceFolder}/.vscode/vscode-R/PID` where `PID` is the R process ID. It also writes the graphics to `plot.png` in this folder and notify

From 3e825decc77945cdef5db913fc02853ec1e87e4b Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sun, 15 Dec 2019 14:29:41 +0800
Subject: [PATCH 065/795] Check if init.R already sourced

---
 R/init.R | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/R/init.R b/R/init.R
index 6363b4000..45b8b2922 100644
--- a/R/init.R
+++ b/R/init.R
@@ -1,4 +1,6 @@
-if (interactive() && !identical(Sys.getenv("RSTUDIO"), "1")) {
+if (interactive() && 
+  is.null(getOption("vscodeR")) && 
+  !identical(Sys.getenv("RSTUDIO"), "1")) {
   local({
     pid <- Sys.getpid()
     tempdir <- tempdir()

From b5c0e885226dcc6aef33bf0e4403191dd86ba65f Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Mon, 16 Dec 2019 13:56:09 +0800
Subject: [PATCH 066/795] Use DataTables JS sourced data for View(data.frame)

---
 R/init.R                  | 15 +++++++++------
 resources/js/jsonTable.js | 39 ---------------------------------------
 src/session.ts            | 18 ++++++------------
 3 files changed, 15 insertions(+), 57 deletions(-)
 delete mode 100644 resources/js/jsonTable.js

diff --git a/R/init.R b/R/init.R
index 45b8b2922..f3c1ca746 100644
--- a/R/init.R
+++ b/R/init.R
@@ -74,7 +74,7 @@ if (interactive() &&
         respond("attach")
       }
 
-      table_to_json <- function(data) {
+      dataview_table <- function(data) {
         if (is.data.frame(data)) {
           colnames <- colnames(data)
           if (is.null(colnames)) {
@@ -88,7 +88,6 @@ if (interactive() &&
             data <- cbind(rownames, data, stringsAsFactors = FALSE)
             colnames <- c(" ", colnames)
           }
-          size <- dim(data)
           types <- vapply(data, typeof, character(1L), USE.NAMES = FALSE)
           isf <- vapply(data, is.factor, logical(1L), USE.NAMES = FALSE)
           types[isf] <- "character"
@@ -115,11 +114,15 @@ if (interactive() &&
             colnames <- c(" ", colnames)
             data <- cbind(` ` = trimws(rownames), data)
           }
-          size <- dim(data)
         } else {
           stop("data must be data.frame or matrix")
         }
-        list(size = size, columns = colnames, types = types, data = data)
+        columns <- .mapply(function(title, type) {
+          class <- if (type == "character") "text-left" else "text-right"
+          list(title = jsonlite::unbox(title),
+            className = jsonlite::unbox(class))
+        }, list(colnames, types), NULL)
+        list(columns = columns, data = data)
       }
 
       dataview <- function(x, title, ...) {
@@ -127,9 +130,9 @@ if (interactive() &&
           title <- deparse(substitute(x))[[1]]
         }
         if (is.data.frame(x) || is.matrix(x)) {
-          data <- table_to_json(x)
+          data <- dataview_table(x)
           file <- tempfile(tmpdir = tempdir, fileext = ".json")
-          jsonlite::write_json(data, file, matrix = "columnmajor")
+          jsonlite::write_json(data, file, matrix = "rowmajor")
           respond("dataview", source = "table", type = "json",
             title = title, file = file)
         } else if (is.list(x)) {
diff --git a/resources/js/jsonTable.js b/resources/js/jsonTable.js
deleted file mode 100644
index 74129a1cf..000000000
--- a/resources/js/jsonTable.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var jsonTable = jsonTable || {};
-
-jsonTable = {
-  init: function (data, options) {
-    options = options || {};
-    var container = options.container || "table-container";
-    var datatables_options = options.datatables_options || {};
-    var $table = $("
");
-    var $container = $("#" + container);
-    $container.empty().append($table);
-    var $tableHead = $("");
-    var $tableHeadRow = $("");
-    for (var colId = 0; colId < data.size[1]; colId++) {
-      var $tableHeadColumn = $("")
-        .text(data.columns[colId]);
-      if (data.types[colId] === "character") {
-        $tableHeadColumn.addClass("left");
-      }
-      $tableHeadRow.append($tableHeadColumn);
-    }
-    $tableHead.append($tableHeadRow);
-    $table.append($tableHead);
-    var $tableBody = $("");
-    for (var rowId = 0; rowId < data.size[0]; rowId++) {
-      var $tableBodyRow = $("");
-      for (var colId = 0; colId < data.size[1]; colId++) {
-        var $tableRowCell = $("")
-          .text(data.data[colId][rowId]);
-        if (data.types[colId] === "character") {
-          $tableRowCell.addClass("left");
-        }
-        $tableBodyRow.append($tableRowCell);
-      }
-      $tableBody.append($tableBodyRow);
-    }
-    $table.append($tableBody);
-    $table.DataTable(datatables_options);
-  }
-};
diff --git a/src/session.ts b/src/session.ts
index 462790370..628743dda 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -210,29 +210,23 @@ async function getTableHtml(webview: Webview, file: string) {
     table {
         font-size: 0.75em;
     }
-    table td,
-    table th {
-      text-align: right;
-    }
-    .left {
-      text-align: left;
-    }
   
 
 
   

-    

+    

   

   
   
   
-  
   

From 7821b1243f8ee64f959716484653fdc60df4056d Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 17 Dec 2019 13:42:31 +0800
Subject: [PATCH 067/795] Refine showDataView

---
 src/session.ts | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/session.ts b/src/session.ts
index 628743dda..d8343dba0 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -115,7 +115,10 @@ function showBrowser(url: string) {
     console.info("browser uri: " + url);
     const port = parseInt(new URL(url).port, 10);
     const panel = window.createWebviewPanel("browser", url,
-        { preserveFocus: true, viewColumn: ViewColumn.Active },
+        {
+            preserveFocus: true,
+            viewColumn: ViewColumn.Active
+        },
         {
             enableScripts: true,
             portMapping: [
@@ -149,9 +152,13 @@ async function showWebView(file: string) {
     const dir = path.dirname(file);
     console.info("webview uri: " + file);
     const panel = window.createWebviewPanel("webview", "WebView",
-        { preserveFocus: true, viewColumn: ViewColumn.Two },
         {
-            enableScripts: true, localResourceRoots: [Uri.file(dir)],
+            preserveFocus: true,
+            viewColumn: ViewColumn.Two
+        },
+        {
+            enableScripts: true,
+            localResourceRoots: [Uri.file(dir)],
         });
     const content = await fs.readFile(file);
     const html = content.toString()
@@ -163,33 +170,24 @@ async function showWebView(file: string) {
 }
 
 async function showDataView(source: string, type: string, title: string, file: string) {
+    const panel = window.createWebviewPanel("dataview", title,
+        {
+            preserveFocus: true,
+            viewColumn: ViewColumn.Two,
+        },
+        {
+            enableScripts: true,
+            localResourceRoots: [Uri.file(resDir)],
+        });
+    let content: string;
     if (source === "table") {
-        const panel = window.createWebviewPanel("dataview", title,
-            {
-                preserveFocus: true,
-                viewColumn: ViewColumn.Two,
-            },
-            {
-                enableScripts: true,
-                localResourceRoots: [Uri.file(resDir)],
-            });
-        const content = await getTableHtml(panel.webview, file);
-        panel.webview.html = content;
+        content = await getTableHtml(panel.webview, file);
     } else if (source === "list") {
-        const panel = window.createWebviewPanel("dataview", title,
-            {
-                preserveFocus: true,
-                viewColumn: ViewColumn.Two,
-            },
-            {
-                enableScripts: true,
-                localResourceRoots: [Uri.file(resDir)],
-            });
-        const content = await getListHtml(panel.webview, file);
-        panel.webview.html = content;
+        content = await getListHtml(panel.webview, file);
     } else {
         console.error("Unsupported data source: " + source);
     }
+    panel.webview.html = content;
 }
 
 async function getTableHtml(webview: Webview, file: string) {
@@ -302,6 +300,6 @@ async function updateResponse(event) {
         showDataView(parseResult.source,
             parseResult.type, parseResult.title, parseResult.file);
     } else {
-        console.info("Unrecognised command: ${parseResult.command}");
+        console.error("Unsupported command: " + parseResult.command);
     }
 }

From 18019f5aff1cf72ebc6eeb8bb468453693835e11 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Tue, 17 Dec 2019 16:06:42 +0900
Subject: [PATCH 068/795] remove outside files

---
 package-lock.json                           |  25 ++-
 package.json                                |   5 +-
 resources/css/dataTables.bootstrap4.min.css |   1 -
 resources/css/jquery.json-viewer.css        |  57 -------
 resources/js/jquery.dataTables.min.js       | 180 --------------------
 resources/js/jquery.json-viewer.js          | 158 -----------------
 resources/js/jquery.min.js                  |   2 -
 src/extension.ts                            |   9 +-
 src/session.ts                              |  41 ++---
 9 files changed, 52 insertions(+), 426 deletions(-)
 delete mode 100644 resources/css/dataTables.bootstrap4.min.css
 delete mode 100644 resources/css/jquery.json-viewer.css
 delete mode 100644 resources/js/jquery.dataTables.min.js
 delete mode 100644 resources/js/jquery.json-viewer.js
 delete mode 100644 resources/js/jquery.min.js

diff --git a/package-lock.json b/package-lock.json
index 12765941e..4ba8f8d16 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "r",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -592,6 +592,11 @@
       "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
       "dev": true
     },
+    "bootstrap": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
+      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA=="
+    },
     "boxen": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
@@ -1329,6 +1334,14 @@
       "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
       "dev": true
     },
+    "datatables": {
+      "version": "1.10.18",
+      "resolved": "https://registry.npmjs.org/datatables/-/datatables-1.10.18.tgz",
+      "integrity": "sha512-ntatMgS9NN6UMpwbmO+QkYJuKlVeMA2Mi0Gu/QxyIh+dW7ZjLSDhPT2tWlzjpIWEkDYgieDzS9Nu7bdQCW0sbQ==",
+      "requires": {
+        "jquery": ">=1.7"
+      }
+    },
     "debug": {
       "version": "3.2.6",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -3305,6 +3318,16 @@
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true
     },
+    "jquery": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
+      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
+    },
+    "jquery.json-viewer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jquery.json-viewer/-/jquery.json-viewer-1.4.0.tgz",
+      "integrity": "sha512-6H1U/w+/8vMwDH5Im0OveuKPZ1fZWy7hgvR3Cn+HeamQIoWrVqBuRaE2TF/xEc6Hmi3vhQVRqZBmYGKTdOo2tw=="
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
diff --git a/package.json b/package.json
index 4193e94e2..50383b808 100644
--- a/package.json
+++ b/package.json
@@ -401,6 +401,9 @@
   "dependencies": {
     "fs-extra": "^8.1.0",
     "path": "^0.12.7",
-    "winattr": "^3.0.0"
+    "winattr": "^3.0.0",
+    "bootstrap": "^4.4.1",
+    "datatables": "^1.10.18",
+    "jquery.json-viewer": "^1.4.0"
   }
 }
diff --git a/resources/css/dataTables.bootstrap4.min.css b/resources/css/dataTables.bootstrap4.min.css
deleted file mode 100644
index f1930be0e..000000000
--- a/resources/css/dataTables.bootstrap4.min.css
+++ /dev/null
@@ -1 +0,0 @@
-table.dataTable{clear:both;margin-top:6px !important;margin-bottom:6px !important;max-width:none !important;border-collapse:separate !important;border-spacing:0}table.dataTable td,table.dataTable th{-webkit-box-sizing:content-box;box-sizing:content-box}table.dataTable td.dataTables_empty,table.dataTable th.dataTables_empty{text-align:center}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}div.dataTables_wrapper div.dataTables_length label{font-weight:normal;text-align:left;white-space:nowrap}div.dataTables_wrapper div.dataTables_length select{width:auto;display:inline-block}div.dataTables_wrapper div.dataTables_filter{text-align:right}div.dataTables_wrapper div.dataTables_filter label{font-weight:normal;white-space:nowrap;text-align:left}div.dataTables_wrapper div.dataTables_filter input{margin-left:0.5em;display:inline-block;width:auto}div.dataTables_wrapper div.dataTables_info{padding-top:0.85em;white-space:nowrap}div.dataTables_wrapper div.dataTables_paginate{margin:0;white-space:nowrap;text-align:right}div.dataTables_wrapper div.dataTables_paginate ul.pagination{margin:2px 0;white-space:nowrap;justify-content:flex-end}div.dataTables_wrapper div.dataTables_processing{position:absolute;top:50%;left:50%;width:200px;margin-left:-100px;margin-top:-26px;text-align:center;padding:1em 0}table.dataTable thead>tr>th.sorting_asc,table.dataTable thead>tr>th.sorting_desc,table.dataTable thead>tr>th.sorting,table.dataTable thead>tr>td.sorting_asc,table.dataTable thead>tr>td.sorting_desc,table.dataTable thead>tr>td.sorting{padding-right:30px}table.dataTable thead>tr>th:active,table.dataTable thead>tr>td:active{outline:none}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{cursor:pointer;position:relative}table.dataTable thead .sorting:before,table.dataTable thead .sorting:after,table.dataTable thead .sorting_asc:before,table.dataTable thead .sorting_asc:after,table.dataTable thead .sorting_desc:before,table.dataTable thead .sorting_desc:after,table.dataTable thead .sorting_asc_disabled:before,table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:before,table.dataTable thead .sorting_desc_disabled:after{position:absolute;bottom:0.9em;display:block;opacity:0.3}table.dataTable thead .sorting:before,table.dataTable thead .sorting_asc:before,table.dataTable thead .sorting_desc:before,table.dataTable thead .sorting_asc_disabled:before,table.dataTable thead .sorting_desc_disabled:before{right:1em;content:"\2191"}table.dataTable thead .sorting:after,table.dataTable thead .sorting_asc:after,table.dataTable thead .sorting_desc:after,table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:after{right:0.5em;content:"\2193"}table.dataTable thead .sorting_asc:before,table.dataTable thead .sorting_desc:after{opacity:1}table.dataTable thead .sorting_asc_disabled:before,table.dataTable thead .sorting_desc_disabled:after{opacity:0}div.dataTables_scrollHead table.dataTable{margin-bottom:0 !important}div.dataTables_scrollBody table{border-top:none;margin-top:0 !important;margin-bottom:0 !important}div.dataTables_scrollBody table thead .sorting:before,div.dataTables_scrollBody table thead .sorting_asc:before,div.dataTables_scrollBody table thead .sorting_desc:before,div.dataTables_scrollBody table thead .sorting:after,div.dataTables_scrollBody table thead .sorting_asc:after,div.dataTables_scrollBody table thead .sorting_desc:after{display:none}div.dataTables_scrollBody table tbody tr:first-child th,div.dataTables_scrollBody table tbody tr:first-child td{border-top:none}div.dataTables_scrollFoot>.dataTables_scrollFootInner{box-sizing:content-box}div.dataTables_scrollFoot>.dataTables_scrollFootInner>table{margin-top:0 !important;border-top:none}@media screen and (max-width: 767px){div.dataTables_wrapper div.dataTables_length,div.dataTables_wrapper div.dataTables_filter,div.dataTables_wrapper div.dataTables_info,div.dataTables_wrapper div.dataTables_paginate{text-align:center}}table.dataTable.table-sm>thead>tr>th{padding-right:20px}table.dataTable.table-sm .sorting:before,table.dataTable.table-sm .sorting_asc:before,table.dataTable.table-sm .sorting_desc:before{top:5px;right:0.85em}table.dataTable.table-sm .sorting:after,table.dataTable.table-sm .sorting_asc:after,table.dataTable.table-sm .sorting_desc:after{top:5px}table.table-bordered.dataTable th,table.table-bordered.dataTable td{border-left-width:0}table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable td:last-child,table.table-bordered.dataTable td:last-child{border-right-width:0}table.table-bordered.dataTable tbody th,table.table-bordered.dataTable tbody td{border-bottom-width:0}div.dataTables_scrollHead table.table-bordered{border-bottom-width:0}div.table-responsive>div.dataTables_wrapper>div.row{margin:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:first-child{padding-left:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:last-child{padding-right:0}
diff --git a/resources/css/jquery.json-viewer.css b/resources/css/jquery.json-viewer.css
deleted file mode 100644
index 57aa4501e..000000000
--- a/resources/css/jquery.json-viewer.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Root element */
-.json-document {
-  padding: 1em 2em;
-}
-
-/* Syntax highlighting for JSON objects */
-ul.json-dict, ol.json-array {
-  list-style-type: none;
-  margin: 0 0 0 1px;
-  border-left: 1px dotted #ccc;
-  padding-left: 2em;
-}
-.json-string {
-  color: #0B7500;
-}
-.json-literal {
-  color: #1A01CC;
-  font-weight: bold;
-}
-
-/* Toggle button */
-a.json-toggle {
-  position: relative;
-  color: inherit;
-  text-decoration: none;
-}
-a.json-toggle:focus {
-  outline: none;
-}
-a.json-toggle:before {
-  font-size: 1.1em;
-  color: #c0c0c0;
-  content: "\25BC"; /* down arrow */
-  position: absolute;
-  display: inline-block;
-  width: 1em;
-  text-align: center;
-  line-height: 1em;
-  left: -1.2em;
-}
-a.json-toggle:hover:before {
-  color: #aaa;
-}
-a.json-toggle.collapsed:before {
-  /* Use rotated down arrow, prevents right arrow appearing smaller than down arrow in some browsers */
-  transform: rotate(-90deg);
-}
-
-/* Collapsable placeholder links */
-a.json-placeholder {
-  color: #aaa;
-  padding: 0 1em;
-  text-decoration: none;
-}
-a.json-placeholder:hover {
-  text-decoration: underline;
-}
diff --git a/resources/js/jquery.dataTables.min.js b/resources/js/jquery.dataTables.min.js
deleted file mode 100644
index d297f256c..000000000
--- a/resources/js/jquery.dataTables.min.js
+++ /dev/null
@@ -1,180 +0,0 @@
-/*!
-   Copyright 2008-2019 SpryMedia Ltd.
-
- This source file is free software, available under the following license:
-   MIT license - http://datatables.net/license
-
- This source file is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
-
- For details please refer to: http://www.datatables.net
- DataTables 1.10.20
- ©2008-2019 SpryMedia Ltd - datatables.net/license
-*/
-var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(f,z,y){f instanceof String&&(f=String(f));for(var p=f.length,H=0;H").css({position:"fixed",top:0,left:-1*f(z).scrollLeft(),height:1,width:1,
-overflow:"hidden"}).append(f("
").css({position:"absolute",top:1,left:1,width:100,overflow:"scroll"}).append(f("
").css({width:"100%",height:10}))).appendTo("body"),d=c.children(),e=d.children();b.barWidth=d[0].offsetWidth-d[0].clientWidth;b.bScrollOversize=100===e[0].offsetWidth&&100!==d[0].clientWidth;b.bScrollbarLeft=1!==Math.round(e.offset().left);b.bBounding=c[0].getBoundingClientRect().width?!0:!1;c.remove()}f.extend(a.oBrowser,q.__browser);a.oScroll.iBarWidth=q.__browser.barWidth}
-function mb(a,b,c,d,e,h){var g=!1;if(c!==p){var k=c;g=!0}for(;d!==e;)a.hasOwnProperty(d)&&(k=g?b(k,a[d],d,a):a[d],g=!0,d+=h);return k}function Ia(a,b){var c=q.defaults.column,d=a.aoColumns.length;c=f.extend({},q.models.oColumn,c,{nTh:b?b:y.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mData:c.mData?c.mData:d,idx:d});a.aoColumns.push(c);c=a.aoPreSearchCols;c[d]=f.extend({},q.models.oSearch,c[d]);ma(a,d,f(b).data())}function ma(a,b,c){b=a.aoColumns[b];
-var d=a.oClasses,e=f(b.nTh);if(!b.sWidthOrig){b.sWidthOrig=e.attr("width")||null;var h=(e.attr("style")||"").match(/width:\s*(\d+[pxem%]+)/);h&&(b.sWidthOrig=h[1])}c!==p&&null!==c&&(kb(c),L(q.defaults.column,c,!0),c.mDataProp===p||c.mData||(c.mData=c.mDataProp),c.sType&&(b._sManualType=c.sType),c.className&&!c.sClass&&(c.sClass=c.className),c.sClass&&e.addClass(c.sClass),f.extend(b,c),M(b,c,"sWidth","sWidthOrig"),c.iDataSort!==p&&(b.aDataSort=[c.iDataSort]),M(b,c,"aDataSort"));var g=b.mData,k=U(g),
-l=b.mRender?U(b.mRender):null;c=function(a){return"string"===typeof a&&-1!==a.indexOf("@")};b._bAttrSrc=f.isPlainObject(g)&&(c(g.sort)||c(g.type)||c(g.filter));b._setter=null;b.fnGetData=function(a,b,c){var d=k(a,b,p,c);return l&&b?l(d,b,a,c):d};b.fnSetData=function(a,b,c){return Q(g)(a,b,c)};"number"!==typeof g&&(a._rowReadObject=!0);a.oFeatures.bSort||(b.bSortable=!1,e.addClass(d.sSortableNone));a=-1!==f.inArray("asc",b.asSorting);c=-1!==f.inArray("desc",b.asSorting);b.bSortable&&(a||c)?a&&!c?(b.sSortingClass=
-d.sSortableAsc,b.sSortingClassJUI=d.sSortJUIAscAllowed):!a&&c?(b.sSortingClass=d.sSortableDesc,b.sSortingClassJUI=d.sSortJUIDescAllowed):(b.sSortingClass=d.sSortable,b.sSortingClassJUI=d.sSortJUI):(b.sSortingClass=d.sSortableNone,b.sSortingClassJUI="")}function aa(a){if(!1!==a.oFeatures.bAutoWidth){var b=a.aoColumns;Ja(a);for(var c=0,d=b.length;cn[m])d(k.length+
-n[m],l);else if("string"===typeof n[m]){var w=0;for(g=k.length;wb&&a[e]--; -1!=d&&c===p&&a.splice(d,1)}function ea(a,b,c,d){var e=a.aoData[b],h,g=function(c,d){for(;c.childNodes.length;)c.removeChild(c.firstChild);c.innerHTML=I(a,b,d,"display")};if("dom"!==c&&(c&&"auto"!==c||"dom"!==e.src)){var k=e.anCells;if(k)if(d!==p)g(k[d],d);else for(c=0,h=k.length;c").appendTo(d));var l=0;for(b=k.length;ltr").attr("role","row");f(d).find(">tr>th, >tr>td").addClass(g.sHeaderTH);f(e).find(">tr>th, >tr>td").addClass(g.sFooterTH);if(null!==e)for(a=a.aoFooter[0],l=0,b=a.length;l=a.fnRecordsDisplay()?0:g,a.iInitDisplayStart=-1);g=a._iDisplayStart;var n=a.fnDisplayEnd();if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++,K(a,!1);else if(!k)a.iDraw++;else if(!a.bDestroying&&!qb(a))return;if(0!==l.length)for(h=k?a.aoData.length:n,k=k?0:g;k",{"class":e?d[0]:""}).append(f("",{valign:"top",colSpan:W(a),"class":a.oClasses.sRowEmpty}).html(c))[0];A(a,"aoHeaderCallback","header",[f(a.nTHead).children("tr")[0],
-Oa(a),g,n,l]);A(a,"aoFooterCallback","footer",[f(a.nTFoot).children("tr")[0],Oa(a),g,n,l]);d=f(a.nTBody);d.children().detach();d.append(f(b));A(a,"aoDrawCallback","draw",[a]);a.bSorted=!1;a.bFiltered=!1;a.bDrawing=!1}}function V(a,b){var c=a.oFeatures,d=c.bFilter;c.bSort&&rb(a);d?ia(a,a.oPreviousSearch):a.aiDisplay=a.aiDisplayMaster.slice();!0!==b&&(a._iDisplayStart=0);a._drawHold=b;S(a);a._drawHold=!1}function sb(a){var b=a.oClasses,c=f(a.nTable);c=f("
").insertBefore(c);var d=a.oFeatures,e=
-f("
",{id:a.sTableId+"_wrapper","class":b.sWrapper+(a.nTFoot?"":" "+b.sNoFooter)});a.nHolding=c[0];a.nTableWrapper=e[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var h=a.sDom.split(""),g,k,l,n,m,p,u=0;u")[0];n=h[u+1];if("'"==n||'"'==n){m="";for(p=2;h[u+p]!=n;)m+=h[u+p],p++;"H"==m?m=b.sJUIHeader:"F"==m&&(m=b.sJUIFooter);-1!=m.indexOf(".")?(n=m.split("."),l.id=n[0].substr(1,n[0].length-1),l.className=n[1]):"#"==m.charAt(0)?l.id=m.substr(1,
-m.length-1):l.className=m;u+=p}e.append(l);e=f(l)}else if(">"==k)e=e.parent();else if("l"==k&&d.bPaginate&&d.bLengthChange)g=tb(a);else if("f"==k&&d.bFilter)g=ub(a);else if("r"==k&&d.bProcessing)g=vb(a);else if("t"==k)g=wb(a);else if("i"==k&&d.bInfo)g=xb(a);else if("p"==k&&d.bPaginate)g=yb(a);else if(0!==q.ext.feature.length)for(l=q.ext.feature,p=0,n=l.length;p',k=d.sSearch;k=k.match(/_INPUT_/)?k.replace("_INPUT_",g):k+g;b=f("
",{id:h.f?null:c+"_filter","class":b.sFilter}).append(f("
").addClass(b.sLength);a.aanFeatures.l||(l[0].id=c+"_length");l.children().append(a.oLanguage.sLengthMenu.replace("_MENU_",
-e[0].outerHTML));f("select",l).val(a._iDisplayLength).on("change.DT",function(b){Va(a,f(this).val());S(a)});f(a.nTable).on("length.dt.DT",function(b,c,d){a===c&&f("select",l).val(d)});return l[0]}function yb(a){var b=a.sPaginationType,c=q.ext.pager[b],d="function"===typeof c,e=function(a){S(a)};b=f("
").addClass(a.oClasses.sPaging+b)[0];var h=a.aanFeatures;d||c.fnInit(a,b,e);h.p||(b.id=a.sTableId+"_paginate",a.aoDrawCallback.push({fn:function(a){if(d){var b=a._iDisplayStart,g=a._iDisplayLength,
-f=a.fnRecordsDisplay(),m=-1===g;b=m?0:Math.ceil(b/g);g=m?1:Math.ceil(f/g);f=c(b,g);var p;m=0;for(p=h.p.length;mh&&(d=0)):"first"==b?d=0:"previous"==b?(d=0<=e?d-e:0,0>d&&(d=0)):"next"==b?d+e",{id:a.aanFeatures.r?null:a.sTableId+"_processing","class":a.oClasses.sProcessing}).html(a.oLanguage.sProcessing).insertBefore(a.nTable)[0]}function K(a,b){a.oFeatures.bProcessing&&f(a.aanFeatures.r).css("display",b?"block":"none");A(a,null,"processing",[a,b])}function wb(a){var b=f(a.nTable);b.attr("role","grid");var c=a.oScroll;if(""===c.sX&&""===c.sY)return a.nTable;var d=c.sX,e=c.sY,
-h=a.oClasses,g=b.children("caption"),k=g.length?g[0]._captionSide:null,l=f(b[0].cloneNode(!1)),n=f(b[0].cloneNode(!1)),m=b.children("tfoot");m.length||(m=null);l=f("
",{"class":h.sScrollWrapper}).append(f("
",{"class":h.sScrollHead}).css({overflow:"hidden",position:"relative",border:0,width:d?d?B(d):null:"100%"}).append(f("
",{"class":h.sScrollHeadInner}).css({"box-sizing":"content-box",width:c.sXInner||"100%"}).append(l.removeAttr("id").css("margin-left",0).append("top"===k?g:null).append(b.children("thead"))))).append(f("
",
-{"class":h.sScrollBody}).css({position:"relative",overflow:"auto",width:d?B(d):null}).append(b));m&&l.append(f("
",{"class":h.sScrollFoot}).css({overflow:"hidden",border:0,width:d?d?B(d):null:"100%"}).append(f("
",{"class":h.sScrollFootInner}).append(n.removeAttr("id").css("margin-left",0).append("bottom"===k?g:null).append(b.children("tfoot")))));b=l.children();var p=b[0];h=b[1];var u=m?b[2]:null;if(d)f(h).on("scroll.DT",function(a){a=this.scrollLeft;p.scrollLeft=a;m&&(u.scrollLeft=a)});
-f(h).css(e&&c.bCollapse?"max-height":"height",e);a.nScrollHead=p;a.nScrollBody=h;a.nScrollFoot=u;a.aoDrawCallback.push({fn:na,sName:"scrolling"});return l[0]}function na(a){var b=a.oScroll,c=b.sX,d=b.sXInner,e=b.sY;b=b.iBarWidth;var h=f(a.nScrollHead),g=h[0].style,k=h.children("div"),l=k[0].style,n=k.children("table");k=a.nScrollBody;var m=f(k),w=k.style,u=f(a.nScrollFoot).children("div"),q=u.children("table"),t=f(a.nTHead),r=f(a.nTable),v=r[0],za=v.style,T=a.nTFoot?f(a.nTFoot):null,A=a.oBrowser,
-x=A.bScrollOversize,ac=J(a.aoColumns,"nTh"),Ya=[],y=[],z=[],C=[],G,H=function(a){a=a.style;a.paddingTop="0";a.paddingBottom="0";a.borderTopWidth="0";a.borderBottomWidth="0";a.height=0};var D=k.scrollHeight>k.clientHeight;if(a.scrollBarVis!==D&&a.scrollBarVis!==p)a.scrollBarVis=D,aa(a);else{a.scrollBarVis=D;r.children("thead, tfoot").remove();if(T){var E=T.clone().prependTo(r);var F=T.find("tr");E=E.find("tr")}var I=t.clone().prependTo(r);t=t.find("tr");D=I.find("tr");I.find("th, td").removeAttr("tabindex");
-c||(w.width="100%",h[0].style.width="100%");f.each(ua(a,I),function(b,c){G=ba(a,b);c.style.width=a.aoColumns[G].sWidth});T&&N(function(a){a.style.width=""},E);h=r.outerWidth();""===c?(za.width="100%",x&&(r.find("tbody").height()>k.offsetHeight||"scroll"==m.css("overflow-y"))&&(za.width=B(r.outerWidth()-b)),h=r.outerWidth()):""!==d&&(za.width=B(d),h=r.outerWidth());N(H,D);N(function(a){z.push(a.innerHTML);Ya.push(B(f(a).css("width")))},D);N(function(a,b){-1!==f.inArray(a,ac)&&(a.style.width=Ya[b])},
-t);f(D).height(0);T&&(N(H,E),N(function(a){C.push(a.innerHTML);y.push(B(f(a).css("width")))},E),N(function(a,b){a.style.width=y[b]},F),f(E).height(0));N(function(a,b){a.innerHTML='
'+z[b]+"
";a.childNodes[0].style.height="0";a.childNodes[0].style.overflow="hidden";a.style.width=Ya[b]},D);T&&N(function(a,b){a.innerHTML='
'+C[b]+"
";a.childNodes[0].style.height="0";a.childNodes[0].style.overflow="hidden";a.style.width=y[b]},E);r.outerWidth()<
-h?(F=k.scrollHeight>k.offsetHeight||"scroll"==m.css("overflow-y")?h+b:h,x&&(k.scrollHeight>k.offsetHeight||"scroll"==m.css("overflow-y"))&&(za.width=B(F-b)),""!==c&&""===d||O(a,1,"Possible column misalignment",6)):F="100%";w.width=B(F);g.width=B(F);T&&(a.nScrollFoot.style.width=B(F));!e&&x&&(w.height=B(v.offsetHeight+b));c=r.outerWidth();n[0].style.width=B(c);l.width=B(c);d=r.height()>k.clientHeight||"scroll"==m.css("overflow-y");e="padding"+(A.bScrollbarLeft?"Left":"Right");l[e]=d?b+"px":"0px";T&&
-(q[0].style.width=B(c),u[0].style.width=B(c),u[0].style[e]=d?b+"px":"0px");r.children("colgroup").insertBefore(r.children("thead"));m.trigger("scroll");!a.bSorted&&!a.bFiltered||a._drawHold||(k.scrollTop=0)}}function N(a,b,c){for(var d=0,e=0,h=b.length,g,k;e").appendTo(k.find("tbody"));k.find("thead, tfoot").remove();
-k.append(f(a.nTHead).clone()).append(f(a.nTFoot).clone());k.find("tfoot th, tfoot td").css("width","");n=ua(a,k.find("thead")[0]);for(q=0;q").css({width:r.sWidthOrig,margin:0,padding:0,border:0,height:1}));if(a.aoData.length)for(q=0;q").css(h||
-e?{position:"absolute",top:0,left:0,height:1,right:0,overflow:"hidden"}:{}).append(k).appendTo(p);h&&g?k.width(g):h?(k.css("width","auto"),k.removeAttr("width"),k.width()").css("width",B(a)).appendTo(b||y.body);b=a[0].offsetWidth;a.remove();return b}function Kb(a,b){var c=Lb(a,b);if(0>c)return null;var d=a.aoData[c];return d.nTr?d.anCells[b]:f("").html(I(a,c,b,"display"))[0]}function Lb(a,b){for(var c,d=-1,e=-1,h=0,g=a.aoData.length;hd&&(d=c.length,e=h);return e}
-function B(a){return null===a?"0px":"number"==typeof a?0>a?"0px":a+"px":a.match(/\d$/)?a+"px":a}function Y(a){var b=[],c=a.aoColumns;var d=a.aaSortingFixed;var e=f.isPlainObject(d);var h=[];var g=function(a){a.length&&!f.isArray(a[0])?h.push(a):f.merge(h,a)};f.isArray(d)&&g(d);e&&d.pre&&g(d.pre);g(a.aaSorting);e&&d.post&&g(d.post);for(a=0;an?1:0;
-if(0!==m)return"asc"===l.dir?m:-m}m=c[a];n=c[b];return mn?1:0}):g.sort(function(a,b){var h,g=k.length,f=e[a]._aSortData,l=e[b]._aSortData;for(h=0;hp?1:0})}a.bSorted=!0}function Nb(a){var b=a.aoColumns,c=Y(a);a=a.oLanguage.oAria;for(var d=0,e=b.length;d/g,"");var f=h.nTh;f.removeAttribute("aria-sort");
-h.bSortable&&(0e?e+1:3))}e=0;for(h=d.length;ee?e+1:3))}a.aLastSort=d}function Mb(a,b){var c=a.aoColumns[b],d=q.ext.order[c.sSortDataType],e;d&&(e=d.call(a.oInstance,a,b,ca(a,b)));for(var h,g=q.ext.type.order[c.sType+"-pre"],k=0,f=a.aoData.length;k=h.length?[0,c[1]]:c)}));b.search!==p&&f.extend(a.oPreviousSearch,
-Gb(b.search));if(b.columns)for(d=0,e=b.columns.length;d=c&&(b=c-d);b-=b%d;if(-1===d||0>b)b=0;a._iDisplayStart=b}function Ra(a,b){a=a.renderer;var c=q.ext.renderer[b];return f.isPlainObject(a)&&a[b]?c[a[b]]||c._:"string"===typeof a?c[a]||c._:c._}function D(a){return a.oFeatures.bServerSide?"ssp":a.ajax||a.sAjaxSource?"ajax":"dom"}function ka(a,b){var c=Pb.numbers_length,d=Math.floor(c/2);b<=c?a=Z(0,b):a<=d?(a=Z(0,c-2),a.push("ellipsis"),a.push(b-1)):(a>=b-1-d?a=Z(b-(c-2),b):(a=Z(a-d+2,a+d-1),a.push("ellipsis"),
-a.push(b-1)),a.splice(0,0,"ellipsis"),a.splice(0,0,0));a.DT_el="span";return a}function Ha(a){f.each({num:function(b){return Da(b,a)},"num-fmt":function(b){return Da(b,a,bb)},"html-num":function(b){return Da(b,a,Ea)},"html-num-fmt":function(b){return Da(b,a,Ea,bb)}},function(b,c){C.type.order[b+a+"-pre"]=c;b.match(/^html\-/)&&(C.type.search[b+a]=C.type.search.html)})}function Qb(a){return function(){var b=[Ca(this[q.ext.iApiIndex])].concat(Array.prototype.slice.call(arguments));return q.ext.internal[a].apply(this,
-b)}}var q=function(a){this.$=function(a,b){return this.api(!0).$(a,b)};this._=function(a,b){return this.api(!0).rows(a,b).data()};this.api=function(a){return a?new v(Ca(this[C.iApiIndex])):new v(this)};this.fnAddData=function(a,b){var c=this.api(!0);a=f.isArray(a)&&(f.isArray(a[0])||f.isPlainObject(a[0]))?c.rows.add(a):c.row.add(a);(b===p||b)&&c.draw();return a.flatten().toArray()};this.fnAdjustColumnSizing=function(a){var b=this.api(!0).columns.adjust(),c=b.settings()[0],d=c.oScroll;a===p||a?b.draw(!1):
-(""!==d.sX||""!==d.sY)&&na(c)};this.fnClearTable=function(a){var b=this.api(!0).clear();(a===p||a)&&b.draw()};this.fnClose=function(a){this.api(!0).row(a).child.hide()};this.fnDeleteRow=function(a,b,c){var d=this.api(!0);a=d.rows(a);var e=a.settings()[0],h=e.aoData[a[0][0]];a.remove();b&&b.call(this,e,h);(c===p||c)&&d.draw();return h};this.fnDestroy=function(a){this.api(!0).destroy(a)};this.fnDraw=function(a){this.api(!0).draw(a)};this.fnFilter=function(a,b,c,d,e,f){e=this.api(!0);null===b||b===p?
-e.search(a,c,d,f):e.column(b).search(a,c,d,f);e.draw()};this.fnGetData=function(a,b){var c=this.api(!0);if(a!==p){var d=a.nodeName?a.nodeName.toLowerCase():"";return b!==p||"td"==d||"th"==d?c.cell(a,b).data():c.row(a).data()||null}return c.data().toArray()};this.fnGetNodes=function(a){var b=this.api(!0);return a!==p?b.row(a).node():b.rows().nodes().flatten().toArray()};this.fnGetPosition=function(a){var b=this.api(!0),c=a.nodeName.toUpperCase();return"TR"==c?b.row(a).index():"TD"==c||"TH"==c?(a=b.cell(a).index(),
-[a.row,a.columnVisible,a.column]):null};this.fnIsOpen=function(a){return this.api(!0).row(a).child.isShown()};this.fnOpen=function(a,b,c){return this.api(!0).row(a).child(b,c).show().child()[0]};this.fnPageChange=function(a,b){a=this.api(!0).page(a);(b===p||b)&&a.draw(!1)};this.fnSetColumnVis=function(a,b,c){a=this.api(!0).column(a).visible(b);(c===p||c)&&a.columns.adjust().draw()};this.fnSettings=function(){return Ca(this[C.iApiIndex])};this.fnSort=function(a){this.api(!0).order(a).draw()};this.fnSortListener=
-function(a,b,c){this.api(!0).order.listener(a,b,c)};this.fnUpdate=function(a,b,c,d,e){var h=this.api(!0);c===p||null===c?h.row(b).data(a):h.cell(b,c).data(a);(e===p||e)&&h.columns.adjust();(d===p||d)&&h.draw();return 0};this.fnVersionCheck=C.fnVersionCheck;var b=this,c=a===p,d=this.length;c&&(a={});this.oApi=this.internal=C.internal;for(var e in q.ext.internal)e&&(this[e]=Qb(e));this.each(function(){var e={},g=1").appendTo(w));r.nTHead=b[0];b=w.children("tbody");0===b.length&&(b=f("").appendTo(w));r.nTBody=b[0];b=w.children("tfoot");0===b.length&&0").appendTo(w));0===b.length||0===b.children().length?w.addClass(x.sNoFooter):0/g,cc=/^\d{2,4}[\.\/\-]\d{1,2}[\.\/\-]\d{1,2}([T ]{1}\d{1,2}[:\.]\d{2}([\.:]\d{2})?)?$/,dc=/(\/|\.|\*|\+|\?|\||\(|\)|\[|\]|\{|\}|\\|\$|\^|\-)/g,bb=/[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfkɃΞ]/gi,P=function(a){return a&&!0!==a&&"-"!==a?!1:
-!0},Sb=function(a){var b=parseInt(a,10);return!isNaN(b)&&isFinite(a)?b:null},Tb=function(a,b){cb[b]||(cb[b]=new RegExp(Ua(b),"g"));return"string"===typeof a&&"."!==b?a.replace(/\./g,"").replace(cb[b],"."):a},db=function(a,b,c){var d="string"===typeof a;if(P(a))return!0;b&&d&&(a=Tb(a,b));c&&d&&(a=a.replace(bb,""));return!isNaN(parseFloat(a))&&isFinite(a)},Ub=function(a,b,c){return P(a)?!0:P(a)||"string"===typeof a?db(a.replace(Ea,""),b,c)?!0:null:null},J=function(a,b,c){var d=[],e=0,h=a.length;if(c!==
-p)for(;ea.length)){var b=a.slice().sort();for(var c=b[0],d=1,
-e=b.length;d")[0],$b=ya.textContent!==p,bc=/<.*?>/g,Sa=q.util.throttle,Wb=[],G=Array.prototype,ec=function(a){var b,c=q.settings,d=f.map(c,function(a,b){return a.nTable});if(a){if(a.nTable&&a.oApi)return[a];if(a.nodeName&&"table"===a.nodeName.toLowerCase()){var e=f.inArray(a,d);return-1!==e?[c[e]]:null}if(a&&"function"===typeof a.settings)return a.settings().toArray();"string"===typeof a?b=f(a):a instanceof f&&(b=a)}else return[];if(b)return b.map(function(a){e=f.inArray(this,
-d);return-1!==e?c[e]:null}).toArray()};var v=function(a,b){if(!(this instanceof v))return new v(a,b);var c=[],d=function(a){(a=ec(a))&&c.push.apply(c,a)};if(f.isArray(a))for(var e=0,h=a.length;ea?new v(b[a],this[a]):null},filter:function(a){var b=[];if(G.filter)b=G.filter.call(this,a,this);else for(var c=0,d=this.length;c").addClass(c),f("td",d).addClass(c).html(b)[0].colSpan=W(a),e.push(d[0]))};h(c,d);b._details&&b._details.detach();b._details=f(e);b._detailsShow&&b._details.insertAfter(b.nTr)},hb=function(a,b){var c=a.context;c.length&&(a=c[0].aoData[b!==p?b:a[0]])&&a._details&&(a._details.remove(),a._detailsShow=p,a._details=p)},Yb=function(a,b){var c=a.context;c.length&&a.length&&(a=c[0].aoData[a[0]],a._details&&((a._detailsShow=b)?a._details.insertAfter(a.nTr):
-a._details.detach(),ic(c[0])))},ic=function(a){var b=new v(a),c=a.aoData;b.off("draw.dt.DT_details column-visibility.dt.DT_details destroy.dt.DT_details");0g){var m=f.map(d,function(a,b){return a.bVisible?b:null});return[m[m.length+g]]}return[ba(a,g)];case "name":return f.map(e,function(a,b){return a===n[1]?b:null});default:return[]}if(b.nodeName&&b._DT_CellIndex)return[b._DT_CellIndex.column];g=f(h).filter(b).map(function(){return f.inArray(this,
-h)}).toArray();if(g.length||!b.nodeName)return g;g=f(b).closest("*[data-dt-column]");return g.length?[g.data("dt-column")]:[]},a,c)};t("columns()",function(a,b){a===p?a="":f.isPlainObject(a)&&(b=a,a="");b=fb(b);var c=this.iterator("table",function(c){return kc(c,a,b)},1);c.selector.cols=a;c.selector.opts=b;return c});x("columns().header()","column().header()",function(a,b){return this.iterator("column",function(a,b){return a.aoColumns[b].nTh},1)});x("columns().footer()","column().footer()",function(a,
-b){return this.iterator("column",function(a,b){return a.aoColumns[b].nTf},1)});x("columns().data()","column().data()",function(){return this.iterator("column-rows",Zb,1)});x("columns().dataSrc()","column().dataSrc()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].mData},1)});x("columns().cache()","column().cache()",function(a){return this.iterator("column-rows",function(b,c,d,e,f){return la(b.aoData,f,"search"===a?"_aFilterData":"_aSortData",c)},1)});x("columns().nodes()",
-"column().nodes()",function(){return this.iterator("column-rows",function(a,b,c,d,e){return la(a.aoData,e,"anCells",b)},1)});x("columns().visible()","column().visible()",function(a,b){var c=this,d=this.iterator("column",function(b,c){if(a===p)return b.aoColumns[c].bVisible;var d=b.aoColumns,e=d[c],h=b.aoData,n;if(a!==p&&e.bVisible!==a){if(a){var m=f.inArray(!0,J(d,"bVisible"),c+1);d=0;for(n=h.length;dd;return!0};q.isDataTable=q.fnIsDataTable=function(a){var b=f(a).get(0),c=!1;if(a instanceof
-q.Api)return!0;f.each(q.settings,function(a,e){a=e.nScrollHead?f("table",e.nScrollHead)[0]:null;var d=e.nScrollFoot?f("table",e.nScrollFoot)[0]:null;if(e.nTable===b||a===b||d===b)c=!0});return c};q.tables=q.fnTables=function(a){var b=!1;f.isPlainObject(a)&&(b=a.api,a=a.visible);var c=f.map(q.settings,function(b){if(!a||a&&f(b.nTable).is(":visible"))return b.nTable});return b?new v(c):c};q.camelToHungarian=L;t("$()",function(a,b){b=this.rows(b).nodes();b=f(b);return f([].concat(b.filter(a).toArray(),
-b.find(a).toArray()))});f.each(["on","one","off"],function(a,b){t(b+"()",function(){var a=Array.prototype.slice.call(arguments);a[0]=f.map(a[0].split(/\s/),function(a){return a.match(/\.dt\b/)?a:a+".dt"}).join(" ");var d=f(this.tables().nodes());d[b].apply(d,a);return this})});t("clear()",function(){return this.iterator("table",function(a){qa(a)})});t("settings()",function(){return new v(this.context,this.context)});t("init()",function(){var a=this.context;return a.length?a[0].oInit:null});t("data()",
-function(){return this.iterator("table",function(a){return J(a.aoData,"_aData")}).flatten()});t("destroy()",function(a){a=a||!1;return this.iterator("table",function(b){var c=b.nTableWrapper.parentNode,d=b.oClasses,e=b.nTable,h=b.nTBody,g=b.nTHead,k=b.nTFoot,l=f(e);h=f(h);var n=f(b.nTableWrapper),m=f.map(b.aoData,function(a){return a.nTr}),p;b.bDestroying=!0;A(b,"aoDestroyCallback","destroy",[b]);a||(new v(b)).columns().visible(!0);n.off(".DT").find(":not(tbody *)").off(".DT");f(z).off(".DT-"+b.sInstance);
-e!=g.parentNode&&(l.children("thead").detach(),l.append(g));k&&e!=k.parentNode&&(l.children("tfoot").detach(),l.append(k));b.aaSorting=[];b.aaSortingFixed=[];Aa(b);f(m).removeClass(b.asStripeClasses.join(" "));f("th, td",g).removeClass(d.sSortable+" "+d.sSortableAsc+" "+d.sSortableDesc+" "+d.sSortableNone);h.children().detach();h.append(m);g=a?"remove":"detach";l[g]();n[g]();!a&&c&&(c.insertBefore(e,b.nTableReinsertBefore),l.css("width",b.sDestroyWidth).removeClass(d.sTable),(p=b.asDestroyStripes.length)&&
-h.children().each(function(a){f(this).addClass(b.asDestroyStripes[a%p])}));c=f.inArray(b,q.settings);-1!==c&&q.settings.splice(c,1)})});f.each(["column","row","cell"],function(a,b){t(b+"s().every()",function(a){var c=this.selector.opts,e=this;return this.iterator(b,function(d,f,k,l,n){a.call(e[b](f,"cell"===b?k:c,"cell"===b?c:p),f,k,l,n)})})});t("i18n()",function(a,b,c){var d=this.context[0];a=U(a)(d.oLanguage);a===p&&(a=b);c!==p&&f.isPlainObject(a)&&(a=a[c]!==p?a[c]:a._);return a.replace("%d",c)});
-q.version="1.10.20";q.settings=[];q.models={};q.models.oSearch={bCaseInsensitive:!0,sSearch:"",bRegex:!1,bSmart:!0};q.models.oRow={nTr:null,anCells:null,_aData:[],_aSortData:null,_aFilterData:null,_sFilterRow:null,_sRowStripe:"",src:null,idx:-1};q.models.oColumn={idx:null,aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bVisible:null,_sManualType:null,_bAttrSrc:!1,fnCreatedCell:null,fnGetData:null,fnSetData:null,mData:null,mRender:null,nTh:null,nTf:null,sClass:null,sContentPadding:null,
-sDefaultContent:null,sName:null,sSortDataType:"std",sSortingClass:null,sSortingClassJUI:null,sTitle:null,sType:null,sWidth:null,sWidthOrig:null};q.defaults={aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:[],ajax:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:null,bAutoWidth:!0,bDeferRender:!1,bDestroy:!1,bFilter:!0,bInfo:!0,bLengthChange:!0,bPaginate:!0,bProcessing:!1,bRetrieve:!1,bScrollCollapse:!1,bServerSide:!1,bSort:!0,bSortMulti:!0,bSortCellsTop:!1,
-bSortClasses:!0,bStateSave:!1,fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,fnFormatNumber:function(a){return a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,this.oLanguage.sThousands)},fnHeaderCallback:null,fnInfoCallback:null,fnInitComplete:null,fnPreDrawCallback:null,fnRowCallback:null,fnServerData:null,fnServerParams:null,fnStateLoadCallback:function(a){try{return JSON.parse((-1===a.iStateDuration?sessionStorage:localStorage).getItem("DataTables_"+a.sInstance+"_"+location.pathname))}catch(b){}},
-fnStateLoadParams:null,fnStateLoaded:null,fnStateSaveCallback:function(a,b){try{(-1===a.iStateDuration?sessionStorage:localStorage).setItem("DataTables_"+a.sInstance+"_"+location.pathname,JSON.stringify(b))}catch(c){}},fnStateSaveParams:null,iStateDuration:7200,iDeferLoading:null,iDisplayLength:10,iDisplayStart:0,iTabIndex:0,oClasses:{},oLanguage:{oAria:{sSortAscending:": activate to sort column ascending",sSortDescending:": activate to sort column descending"},oPaginate:{sFirst:"First",sLast:"Last",
-sNext:"Next",sPrevious:"Previous"},sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sDecimal:"",sThousands:",",sLengthMenu:"Show _MENU_ entries",sLoadingRecords:"Loading...",sProcessing:"Processing...",sSearch:"Search:",sSearchPlaceholder:"",sUrl:"",sZeroRecords:"No matching records found"},oSearch:f.extend({},q.models.oSearch),sAjaxDataProp:"data",
-sAjaxSource:null,sDom:"lfrtip",searchDelay:null,sPaginationType:"simple_numbers",sScrollX:"",sScrollXInner:"",sScrollY:"",sServerMethod:"GET",renderer:null,rowId:"DT_RowId"};H(q.defaults);q.defaults.column={aDataSort:null,iDataSort:-1,asSorting:["asc","desc"],bSearchable:!0,bSortable:!0,bVisible:!0,fnCreatedCell:null,mData:null,mRender:null,sCellType:"td",sClass:"",sContentPadding:"",sDefaultContent:null,sName:"",sSortDataType:"std",sTitle:null,sType:null,sWidth:null};H(q.defaults.column);q.models.oSettings=
-{oFeatures:{bAutoWidth:null,bDeferRender:null,bFilter:null,bInfo:null,bLengthChange:null,bPaginate:null,bProcessing:null,bServerSide:null,bSort:null,bSortMulti:null,bSortClasses:null,bStateSave:null},oScroll:{bCollapse:null,iBarWidth:0,sX:null,sXInner:null,sY:null},oLanguage:{fnInfoCallback:null},oBrowser:{bScrollOversize:!1,bScrollbarLeft:!1,bBounding:!1,barWidth:0},ajax:null,aanFeatures:[],aoData:[],aiDisplay:[],aiDisplayMaster:[],aIds:{},aoColumns:[],aoHeader:[],aoFooter:[],oPreviousSearch:{},
-aoPreSearchCols:[],aaSorting:null,aaSortingFixed:[],asStripeClasses:null,asDestroyStripes:[],sDestroyWidth:0,aoRowCallback:[],aoHeaderCallback:[],aoFooterCallback:[],aoDrawCallback:[],aoRowCreatedCallback:[],aoPreDrawCallback:[],aoInitComplete:[],aoStateSaveParams:[],aoStateLoadParams:[],aoStateLoaded:[],sTableId:"",nTable:null,nTHead:null,nTFoot:null,nTBody:null,nTableWrapper:null,bDeferLoading:!1,bInitialised:!1,aoOpenRows:[],sDom:null,searchDelay:null,sPaginationType:"two_button",iStateDuration:0,
-aoStateSave:[],aoStateLoad:[],oSavedState:null,oLoadedState:null,sAjaxSource:null,sAjaxDataProp:null,bAjaxDataGet:!0,jqXHR:null,json:p,oAjaxData:p,fnServerData:null,aoServerParams:[],sServerMethod:null,fnFormatNumber:null,aLengthMenu:null,iDraw:0,bDrawing:!1,iDrawError:-1,_iDisplayLength:10,_iDisplayStart:0,_iRecordsTotal:0,_iRecordsDisplay:0,oClasses:{},bFiltered:!1,bSorted:!1,bSortCellsTop:null,oInit:null,aoDestroyCallback:[],fnRecordsTotal:function(){return"ssp"==D(this)?1*this._iRecordsTotal:
-this.aiDisplayMaster.length},fnRecordsDisplay:function(){return"ssp"==D(this)?1*this._iRecordsDisplay:this.aiDisplay.length},fnDisplayEnd:function(){var a=this._iDisplayLength,b=this._iDisplayStart,c=b+a,d=this.aiDisplay.length,e=this.oFeatures,f=e.bPaginate;return e.bServerSide?!1===f||-1===a?b+d:Math.min(b+a,this._iRecordsDisplay):!f||c>d||-1===a?d:c},oInstance:null,sInstance:null,iTabIndex:0,nScrollHead:null,nScrollFoot:null,aLastSort:[],oPlugins:{},rowIdFn:null,rowId:null};q.ext=C={buttons:{},
-classes:{},builder:"-source-",errMode:"alert",feature:[],search:[],selector:{cell:[],column:[],row:[]},internal:{},legacy:{ajax:null},pager:{},renderer:{pageButton:{},header:{}},order:{},type:{detect:[],search:{},order:{}},_unique:0,fnVersionCheck:q.fnVersionCheck,iApiIndex:0,oJUIClasses:{},sVersion:q.version};f.extend(C,{afnFiltering:C.search,aTypes:C.type.detect,ofnSearch:C.type.search,oSort:C.type.order,afnSortData:C.order,aoFeatures:C.feature,oApi:C.internal,oStdClasses:C.classes,oPagination:C.pager});
-f.extend(q.ext.classes,{sTable:"dataTable",sNoFooter:"no-footer",sPageButton:"paginate_button",sPageButtonActive:"current",sPageButtonDisabled:"disabled",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",
-sSortableDesc:"sorting_desc_disabled",sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sFilterInput:"",sLengthSelect:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sHeaderTH:"",sFooterTH:"",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",
-sJUIHeader:"",sJUIFooter:""});var Pb=q.ext.pager;f.extend(Pb,{simple:function(a,b){return["previous","next"]},full:function(a,b){return["first","previous","next","last"]},numbers:function(a,b){return[ka(a,b)]},simple_numbers:function(a,b){return["previous",ka(a,b),"next"]},full_numbers:function(a,b){return["first","previous",ka(a,b),"next","last"]},first_last_numbers:function(a,b){return["first",ka(a,b),"last"]},_numbers:ka,numbers_length:7});f.extend(!0,q.ext.renderer,{pageButton:{_:function(a,b,
-c,d,e,h){var g=a.oClasses,k=a.oLanguage.oPaginate,l=a.oLanguage.oAria.paginate||{},n,m,q=0,t=function(b,d){var p,r=g.sPageButtonDisabled,u=function(b){Xa(a,b.data.action,!0)};var w=0;for(p=d.length;w").appendTo(b);t(x,v)}else{n=null;m=v;x=a.iTabIndex;switch(v){case "ellipsis":b.append('…');break;case "first":n=k.sFirst;0===e&&(x=-1,m+=" "+r);break;case "previous":n=k.sPrevious;0===e&&(x=-1,m+=
-" "+r);break;case "next":n=k.sNext;e===h-1&&(x=-1,m+=" "+r);break;case "last":n=k.sLast;e===h-1&&(x=-1,m+=" "+r);break;default:n=v+1,m=e===v?g.sPageButtonActive:""}null!==n&&(x=f("",{"class":g.sPageButton+" "+m,"aria-controls":a.sTableId,"aria-label":l[v],"data-dt-idx":q,tabindex:x,id:0===c&&"string"===typeof v?a.sTableId+"_"+v:null}).html(n).appendTo(b),$a(x,{action:v},u),q++)}}};try{var v=f(b).find(y.activeElement).data("dt-idx")}catch(mc){}t(f(b).empty(),d);v!==p&&f(b).find("[data-dt-idx="+
-v+"]").focus()}}});f.extend(q.ext.type.detect,[function(a,b){b=b.oLanguage.sDecimal;return db(a,b)?"num"+b:null},function(a,b){if(a&&!(a instanceof Date)&&!cc.test(a))return null;b=Date.parse(a);return null!==b&&!isNaN(b)||P(a)?"date":null},function(a,b){b=b.oLanguage.sDecimal;return db(a,b,!0)?"num-fmt"+b:null},function(a,b){b=b.oLanguage.sDecimal;return Ub(a,b)?"html-num"+b:null},function(a,b){b=b.oLanguage.sDecimal;return Ub(a,b,!0)?"html-num-fmt"+b:null},function(a,b){return P(a)||"string"===
-typeof a&&-1!==a.indexOf("<")?"html":null}]);f.extend(q.ext.type.search,{html:function(a){return P(a)?a:"string"===typeof a?a.replace(Rb," ").replace(Ea,""):""},string:function(a){return P(a)?a:"string"===typeof a?a.replace(Rb," "):a}});var Da=function(a,b,c,d){if(0!==a&&(!a||"-"===a))return-Infinity;b&&(a=Tb(a,b));a.replace&&(c&&(a=a.replace(c,"")),d&&(a=a.replace(d,"")));return 1*a};f.extend(C.type.order,{"date-pre":function(a){a=Date.parse(a);return isNaN(a)?-Infinity:a},"html-pre":function(a){return P(a)?
-"":a.replace?a.replace(/<.*?>/g,"").toLowerCase():a+""},"string-pre":function(a){return P(a)?"":"string"===typeof a?a.toLowerCase():a.toString?a.toString():""},"string-asc":function(a,b){return ab?1:0},"string-desc":function(a,b){return ab?-1:0}});Ha("");f.extend(!0,q.ext.renderer,{header:{_:function(a,b,c,d){f(a.nTable).on("order.dt.DT",function(e,f,g,k){a===f&&(e=c.idx,b.removeClass(c.sSortingClass+" "+d.sSortAsc+" "+d.sSortDesc).addClass("asc"==k[e]?d.sSortAsc:"desc"==k[e]?d.sSortDesc:
-c.sSortingClass))})},jqueryui:function(a,b,c,d){f("
").addClass(d.sSortJUIWrapper).append(b.contents()).append(f("").addClass(d.sSortIcon+" "+c.sSortingClassJUI)).appendTo(b);f(a.nTable).on("order.dt.DT",function(e,f,g,k){a===f&&(e=c.idx,b.removeClass(d.sSortAsc+" "+d.sSortDesc).addClass("asc"==k[e]?d.sSortAsc:"desc"==k[e]?d.sSortDesc:c.sSortingClass),b.find("span."+d.sSortIcon).removeClass(d.sSortJUIAsc+" "+d.sSortJUIDesc+" "+d.sSortJUI+" "+d.sSortJUIAscAllowed+" "+d.sSortJUIDescAllowed).addClass("asc"==
-k[e]?d.sSortJUIAsc:"desc"==k[e]?d.sSortJUIDesc:c.sSortingClassJUI))})}}});var ib=function(a){return"string"===typeof a?a.replace(//g,">").replace(/"/g,"""):a};q.render={number:function(a,b,c,d,e){return{display:function(f){if("number"!==typeof f&&"string"!==typeof f)return f;var g=0>f?"-":"",h=parseFloat(f);if(isNaN(h))return ib(f);h=h.toFixed(c);f=Math.abs(h);h=parseInt(f,10);f=c?b+(f-h).toFixed(c).substring(2):"";return g+(d||"")+h.toString().replace(/\B(?=(\d{3})+(?!\d))/g,
-a)+f+(e||"")}}},text:function(){return{display:ib,filter:ib}}};f.extend(q.ext.internal,{_fnExternApiFunc:Qb,_fnBuildAjax:va,_fnAjaxUpdate:qb,_fnAjaxParameters:zb,_fnAjaxUpdateDraw:Ab,_fnAjaxDataSrc:wa,_fnAddColumn:Ia,_fnColumnOptions:ma,_fnAdjustColumnSizing:aa,_fnVisibleToColumnIndex:ba,_fnColumnIndexToVisible:ca,_fnVisbleColumns:W,_fnGetColumns:oa,_fnColumnTypes:Ka,_fnApplyColumnDefs:nb,_fnHungarianMap:H,_fnCamelToHungarian:L,_fnLanguageCompat:Ga,_fnBrowserDetect:lb,_fnAddData:R,_fnAddTr:pa,_fnNodeToDataIndex:function(a,
-b){return b._DT_RowIndex!==p?b._DT_RowIndex:null},_fnNodeToColumnIndex:function(a,b,c){return f.inArray(c,a.aoData[b].anCells)},_fnGetCellData:I,_fnSetCellData:ob,_fnSplitObjNotation:Na,_fnGetObjectDataFn:U,_fnSetObjectDataFn:Q,_fnGetDataMaster:Oa,_fnClearTable:qa,_fnDeleteIndex:ra,_fnInvalidate:ea,_fnGetRowElements:Ma,_fnCreateTr:La,_fnBuildHead:pb,_fnDrawHead:ha,_fnDraw:S,_fnReDraw:V,_fnAddOptionsHtml:sb,_fnDetectHeader:fa,_fnGetUniqueThs:ua,_fnFeatureHtmlFilter:ub,_fnFilterComplete:ia,_fnFilterCustom:Db,
-_fnFilterColumn:Cb,_fnFilter:Bb,_fnFilterCreateSearch:Ta,_fnEscapeRegex:Ua,_fnFilterData:Eb,_fnFeatureHtmlInfo:xb,_fnUpdateInfo:Hb,_fnInfoMacros:Ib,_fnInitialise:ja,_fnInitComplete:xa,_fnLengthChange:Va,_fnFeatureHtmlLength:tb,_fnFeatureHtmlPaginate:yb,_fnPageChange:Xa,_fnFeatureHtmlProcessing:vb,_fnProcessingDisplay:K,_fnFeatureHtmlTable:wb,_fnScrollDraw:na,_fnApplyToChildren:N,_fnCalculateColumnWidths:Ja,_fnThrottle:Sa,_fnConvertToWidth:Jb,_fnGetWidestNode:Kb,_fnGetMaxLenString:Lb,_fnStringToCss:B,
-_fnSortFlatten:Y,_fnSort:rb,_fnSortAria:Nb,_fnSortListener:Za,_fnSortAttachListener:Qa,_fnSortingClasses:Aa,_fnSortData:Mb,_fnSaveState:Ba,_fnLoadState:Ob,_fnSettingsFromNode:Ca,_fnLog:O,_fnMap:M,_fnBindAction:$a,_fnCallbackReg:E,_fnCallbackFire:A,_fnLengthOverflow:Wa,_fnRenderer:Ra,_fnDataSource:D,_fnRowAttributes:Pa,_fnExtend:ab,_fnCalculateEnd:function(){}});f.fn.dataTable=q;q.$=f;f.fn.dataTableSettings=q.settings;f.fn.dataTableExt=q.ext;f.fn.DataTable=function(a){return f(this).dataTable(a).api()};
-f.each(q,function(a,b){f.fn.DataTable[a]=b});return f.fn.dataTable});
diff --git a/resources/js/jquery.json-viewer.js b/resources/js/jquery.json-viewer.js
deleted file mode 100644
index 611411bc7..000000000
--- a/resources/js/jquery.json-viewer.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * jQuery json-viewer
- * @author: Alexandre Bodelot 
- * @link: https://github.com/abodelot/jquery.json-viewer
- */
-(function($) {
-
-  /**
-   * Check if arg is either an array with at least 1 element, or a dict with at least 1 key
-   * @return boolean
-   */
-  function isCollapsable(arg) {
-    return arg instanceof Object && Object.keys(arg).length > 0;
-  }
-
-  /**
-   * Check if a string represents a valid url
-   * @return boolean
-   */
-  function isUrl(string) {
-    var urlRegexp = /^(https?:\/\/|ftps?:\/\/)?([a-z0-9%-]+\.){1,}([a-z0-9-]+)?(:(\d{1,5}))?(\/([a-z0-9\-._~:/?#[\]@!$&'()*+,;=%]+)?)?$/i;
-    return urlRegexp.test(string);
-  }
-
-  /**
-   * Transform a json object into html representation
-   * @return string
-   */
-  function json2html(json, options) {
-    var html = '';
-    if (typeof json === 'string') {
-      // Escape tags and quotes
-      json = json
-        .replace(/&/g, '&')
-        .replace(//g, '>')
-        .replace(/'/g, ''')
-        .replace(/"/g, '"');
-
-      if (options.withLinks && isUrl(json)) {
-        html += '' + json + '';
-      } else {
-        // Escape double quotes in the rendered non-URL string.
-        json = json.replace(/"/g, '\\"');
-        html += '"' + json + '"';
-      }
-    } else if (typeof json === 'number') {
-      html += '' + json + '';
-    } else if (typeof json === 'boolean') {
-      html += '' + json + '';
-    } else if (json === null) {
-      html += 'null';
-    } else if (json instanceof Array) {
-      if (json.length > 0) {
-        html += '[
    ';
-        for (var i = 0; i < json.length; ++i) {
-          html += '
  1. ';
-          // Add toggle button if item is collapsable
-          if (isCollapsable(json[i])) {
-            html += '';
-          }
-          html += json2html(json[i], options);
-          // Add comma if item is not last
-          if (i < json.length - 1) {
-            html += ',';
-          }
-          html += '
    2. ';
-        }
-        html += '
]';
-      } else {
-        html += '[]';
-      }
-    } else if (typeof json === 'object') {
-      var keyCount = Object.keys(json).length;
-      if (keyCount > 0) {
-        html += '{
    ';
-        for (var key in json) {
-          if (Object.prototype.hasOwnProperty.call(json, key)) {
-            html += '
  • ';
-            var keyRepr = options.withQuotes ?
-              '"' + key + '"' : key;
-            // Add toggle button if item is collapsable
-            if (isCollapsable(json[key])) {
-              html += '' + keyRepr + '';
-            } else {
-              html += keyRepr;
-            }
-            html += ': ' + json2html(json[key], options);
-            // Add comma if item is not last
-            if (--keyCount > 0) {
-              html += ',';
-            }
-            html += '
    • ';
-          }
-        }
-        html += '
}';
-      } else {
-        html += '{}';
-      }
-    }
-    return html;
-  }
-
-  /**
-   * jQuery plugin method
-   * @param json: a javascript object
-   * @param options: an optional options hash
-   */
-  $.fn.jsonViewer = function(json, options) {
-    // Merge user options with default options
-    options = Object.assign({}, {
-      collapsed: false,
-      rootCollapsable: true,
-      withQuotes: false,
-      withLinks: true
-    }, options);
-
-    // jQuery chaining
-    return this.each(function() {
-
-      // Transform to HTML
-      var html = json2html(json, options);
-      if (options.rootCollapsable && isCollapsable(json)) {
-        html = '' + html;
-      }
-
-      // Insert HTML in target DOM element
-      $(this).html(html);
-      $(this).addClass('json-document');
-
-      // Bind click on toggle buttons
-      $(this).off('click');
-      $(this).on('click', 'a.json-toggle', function() {
-        var target = $(this).toggleClass('collapsed').siblings('ul.json-dict, ol.json-array');
-        target.toggle();
-        if (target.is(':visible')) {
-          target.siblings('.json-placeholder').remove();
-        } else {
-          var count = target.children('li').length;
-          var placeholder = count + (count > 1 ? ' items' : ' item');
-          target.after('' + placeholder + '');
-        }
-        return false;
-      });
-
-      // Simulate click on toggle button when placeholder is clicked
-      $(this).on('click', 'a.json-placeholder', function() {
-        $(this).siblings('a.json-toggle').click();
-        return false;
-      });
-
-      if (options.collapsed == true) {
-        // Trigger click to collapse all nodes
-        $(this).find('a.json-toggle').click();
-      }
-    });
-  };
-})(jQuery);
diff --git a/resources/js/jquery.min.js b/resources/js/jquery.min.js
deleted file mode 100644
index a1c07fd80..000000000
--- a/resources/js/jquery.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;nx",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0 new CompletionItem(`${x} `));
 
-export let sessionStatusBarItem: StatusBarItem;
-
 // This method is called when your extension is activated
 // Your extension is activated the very first time the command is executed
 export function activate(context: ExtensionContext) {
@@ -148,8 +146,7 @@ export function activate(context: ExtensionContext) {
                 return new Hover("```\n" + globalenv[text].str + "\n```");
             },
         });
-
-        sessionStatusBarItem = window.createStatusBarItem(StatusBarAlignment.Right, 1000);
+        const sessionStatusBarItem = window.createStatusBarItem(StatusBarAlignment.Right, 1000);
         sessionStatusBarItem.command = "r.attachActive";
         sessionStatusBarItem.text = "R: (not attached)";
         sessionStatusBarItem.tooltip = "Attach Active Terminal";
@@ -157,7 +154,7 @@ export function activate(context: ExtensionContext) {
         sessionStatusBarItem.show();
 
         deploySessionWatcher(context.extensionPath);
-        startResponseWatcher();
+        startResponseWatcher(sessionStatusBarItem);
     }
 }
 
diff --git a/src/session.ts b/src/session.ts
index d8343dba0..9ff542e12 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -4,8 +4,7 @@ import fs = require("fs-extra");
 import os = require("os");
 import path = require("path");
 import { URL } from "url";
-import { commands, FileSystemWatcher, RelativePattern, Uri, ViewColumn, Webview, window, workspace } from "vscode";
-import { sessionStatusBarItem } from "./extension";
+import { commands, FileSystemWatcher, RelativePattern, StatusBarItem, Uri, ViewColumn, Webview, window, workspace } from "vscode";
 import { chooseTerminalAndSendText } from "./rTerminal";
 import { config } from "./util";
 
@@ -14,10 +13,12 @@ let responseWatcher: FileSystemWatcher;
 let globalEnvWatcher: FileSystemWatcher;
 let plotWatcher: FileSystemWatcher;
 let PID: string;
+let nodeDir: string;
 let resDir: string;
 const sessionDir = path.join(".vscode", "vscode-R");
 
 export function deploySessionWatcher(extensionPath: string) {
+    nodeDir = path.join(extensionPath, "node_modules");
     resDir = path.join(extensionPath, "resources");
     const srcPath = path.join(extensionPath, "R", "init.R");
     const targetDir = path.join(os.homedir(), ".vscode-R");
@@ -28,13 +29,13 @@ export function deploySessionWatcher(extensionPath: string) {
     fs.copySync(srcPath, targetPath);
 }
 
-export function startResponseWatcher() {
+export function startResponseWatcher(sessionStatusBarItem: StatusBarItem) {
     responseWatcher = workspace.createFileSystemWatcher(
         new RelativePattern(
             workspace.workspaceFolders[0],
             path.join(".vscode", "vscode-R", "response.log")));
-    responseWatcher.onDidCreate(updateResponse);
-    responseWatcher.onDidChange(updateResponse);
+    responseWatcher.onDidCreate(() => updateResponse(sessionStatusBarItem));
+    responseWatcher.onDidChange(() => updateResponse(sessionStatusBarItem));
 }
 
 export function attachActive() {
@@ -117,7 +118,7 @@ function showBrowser(url: string) {
     const panel = window.createWebviewPanel("browser", url,
         {
             preserveFocus: true,
-            viewColumn: ViewColumn.Active
+            viewColumn: ViewColumn.Active,
         },
         {
             enableScripts: true,
@@ -152,13 +153,13 @@ async function showWebView(file: string) {
     const dir = path.dirname(file);
     console.info("webview uri: " + file);
     const panel = window.createWebviewPanel("webview", "WebView",
-        {
-            preserveFocus: true,
-            viewColumn: ViewColumn.Two
-        },
-        {
-            enableScripts: true,
-            localResourceRoots: [Uri.file(dir)],
+    {
+    preserveFocus: true,
+    viewColumn: ViewColumn.Two
+},
+{
+    enableScripts: true,
+    localResourceRoots: [Uri.file(dir)],
         });
     const content = await fs.readFile(file);
     const html = content.toString()
@@ -198,7 +199,7 @@ async function getTableHtml(webview: Webview, file: string) {
 
   
   
-  
+  
   
   
+
+
+  

+    ${imgs}
+  

+
+
+`;
+}
+
 async function updateResponse(sessionStatusBarItem: StatusBarItem) {
     console.info("Response file updated!");
     // Read last line from response file
@@ -307,6 +356,8 @@ async function updateResponse(sessionStatusBarItem: StatusBarItem) {
     const parseResult = JSON.parse(lastLine);
     if (parseResult.command === "attach") {
         PID = String(parseResult.pid);
+        tempDir = parseResult.tempdir;
+        plotDir = path.join(tempDir, "images");
         console.info("Got PID: " + PID);
         sessionStatusBarItem.text = "R: " + PID;
         sessionStatusBarItem.show();
diff --git a/webpack.config.js b/webpack.config.js
index 7629411ae..a333bcc4c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -50,6 +50,8 @@ const config = {
       { from: './node_modules/datatables.net-fixedheader/js/dataTables.fixedHeader.min.js', to: 'resources' },
       { from: './node_modules/datatables.net-fixedheader-jqui/js/fixedHeader.jqueryui.min.js', to: 'resources' },
       { from: './node_modules/datatables.net-fixedheader-jqui/css/fixedHeader.jqueryui.min.css', to: 'resources' },
+      { from: './node_modules/fotorama/fotorama.js', to: 'resources' },
+      { from: './node_modules/fotorama/fotorama.css', to: 'resources' },
     ]),
   ],
 };

From 2f041a89089a2196d607bb503fcdaf009424d0fc Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Thu, 9 Jan 2020 01:15:56 +0800
Subject: [PATCH 100/795] Make image viewer center of page

---
 src/session.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/session.ts b/src/session.ts
index a77894585..5896cfd21 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -325,8 +325,7 @@ function getPlotHistoryHtml(webview: Webview, files: string[]) {
 
   
   
-  
-  
+  
   
   
 
 
-  

-    ${imgs}
+  

+    

+      

+        ${imgs}
+      

+    

   

+  
+  
 
 
 `;

From 136b2d051ff56865ab86eefc04c01a0e783f37b5 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Thu, 9 Jan 2020 09:05:32 +0800
Subject: [PATCH 101/795] Update plot history WebView and resources

---
 src/session.ts    | 1 +
 webpack.config.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/session.ts b/src/session.ts
index 5896cfd21..f0eac6652 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -305,6 +305,7 @@ export async function showPlotHistory() {
                 viewColumn: ViewColumn.Two,
             },
             {
+                retainContextWhenHidden: true,
                 enableScripts: true,
                 localResourceRoots: [Uri.file(resDir), Uri.file(plotDir)],
             });
diff --git a/webpack.config.js b/webpack.config.js
index a333bcc4c..56e6eb12e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -52,6 +52,8 @@ const config = {
       { from: './node_modules/datatables.net-fixedheader-jqui/css/fixedHeader.jqueryui.min.css', to: 'resources' },
       { from: './node_modules/fotorama/fotorama.js', to: 'resources' },
       { from: './node_modules/fotorama/fotorama.css', to: 'resources' },
+      { from: './node_modules/fotorama/fotorama.png', to: 'resources' },
+      { from: './node_modules/fotorama/fotorama@2x.png', to: 'resources' },
     ]),
   ],
 };

From e236393d45fcdb11d59bd9daec19c125551bfdf5 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Thu, 9 Jan 2020 11:22:47 +0800
Subject: [PATCH 102/795] Add some error handling

---
 R/init.R       |  2 +-
 src/session.ts | 34 +++++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/R/init.R b/R/init.R
index 33a5dcb21..ec3e429e5 100644
--- a/R/init.R
+++ b/R/init.R
@@ -21,7 +21,7 @@ if (interactive() && !identical(Sys.getenv("RSTUDIO"), "1")) {
 
         new_plot <- function() {
           plot_history_file <<- file.path(dir_plot_history,
-            format(Sys.time(), "%Y%m%d-%H%M%OS3.png"))
+            format(Sys.time(), "%Y%m%d-%H%M%OS6.png"))
           plot_updated <<- TRUE
         }
 
diff --git a/src/session.ts b/src/session.ts
index f0eac6652..eaca52939 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -298,19 +298,27 @@ async function getListHtml(webview: Webview, file: string) {
 
 export async function showPlotHistory() {
     if (config.get("sessionWatcher")) {
-        const files = await fs.readdir(plotDir);
-        const panel = window.createWebviewPanel("plotHistory", "Plot History",
-            {
-                preserveFocus: true,
-                viewColumn: ViewColumn.Two,
-            },
-            {
-                retainContextWhenHidden: true,
-                enableScripts: true,
-                localResourceRoots: [Uri.file(resDir), Uri.file(plotDir)],
-            });
-        const html = getPlotHistoryHtml(panel.webview, files)
-        panel.webview.html = html;
+        if (plotDir === undefined) {
+            window.showErrorMessage("No session is attached.")
+        } else {
+            const files = await fs.readdir(plotDir);
+            if (files.length > 0) {
+                const panel = window.createWebviewPanel("plotHistory", "Plot History",
+                    {
+                        preserveFocus: true,
+                        viewColumn: ViewColumn.Two,
+                    },
+                    {
+                        retainContextWhenHidden: true,
+                        enableScripts: true,
+                        localResourceRoots: [Uri.file(resDir), Uri.file(plotDir)],
+                    });
+                const html = getPlotHistoryHtml(panel.webview, files)
+                panel.webview.html = html;
+            } else {
+                window.showInformationMessage("There is no plot to show yet.")
+            }
+        }
     } else {
         window.showInformationMessage("This command requires that r.sessionWatcher be enabled.");
     }

From bd08dd5d33a948000609164ababe1d4b958ab3b0 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Mon, 13 Jan 2020 17:33:38 +0900
Subject: [PATCH 103/795] fix style

---
 src/rTerminal.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index da375847a..f492c0843 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -5,8 +5,8 @@ import { isDeepStrictEqual } from "util";
 import { commands, Terminal, window } from "vscode";
 
 import { getSelection } from "./selection";
-import { config, delay, getRpath } from "./util";
 import { removeSessionFiles } from "./session";
+import { config, delay, getRpath } from "./util";
 export let rTerm: Terminal;
 
 export function createRTerm(preserveshow?: boolean): boolean {

From 7c157ad8ee1a5f3e8a697bc206c6949065987b8a Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Mon, 13 Jan 2020 17:35:17 +0900
Subject: [PATCH 104/795] version 1.2.1

---
 CHANGELOG.md | 5 +++++
 package.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c85e0ec1..829018d90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 1.2.1
+
+* Extend View (Thank you @renkun-ken)
+* Fix session watcher init.R path on Windows (Fixed #176)
+
 ## 1.2.0
 
 * R session watcher (Thank you @renkun-ken). Usage is written on the README.md
diff --git a/package.json b/package.json
index 96cbb479e..b2a6cc24b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "r",
   "displayName": "R",
   "description": "Support for R language(run,syntax,snippet)",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": "Yuki Ueda",
   "license": "SEE LICENSE IN LICENSE",
   "publisher": "Ikuyadeu",

From 3303fa8253f4903a8e70589d12c6e5d6f1feaf52 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 15 Jan 2020 13:03:39 +0800
Subject: [PATCH 105/795] Add row hover and select

---
 src/session.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/session.ts b/src/session.ts
index ef1660d40..384242772 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -229,7 +229,7 @@ async function getTableHtml(webview: Webview, file: string) {
 
 
   

-    

+    

   

   
   
@@ -247,6 +247,9 @@ async function getTableHtml(webview: Webview, file: string) {
         order: [],
         fixedHeader: true
       });
+      $("#data-table tbody").on("click", "tr", function() {
+        $(this).toggleClass("bg-dark text-light");
+      });
     });
   
 

From 1d1b4ad0e96da5c48a5f59f3b93c7d19c475d33b Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 15 Jan 2020 20:58:41 +0800
Subject: [PATCH 106/795] Fix WebView Uri replacing

---
 src/session.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/session.ts b/src/session.ts
index ef1660d40..63d200ffe 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -163,10 +163,8 @@ async function showWebView(file: string) {
         });
     const content = await fs.readFile(file);
     const html = content.toString()
-        .replace("",
-            "")
-        .replace(/
   
@@ -248,7 +248,7 @@ async function getTableHtml(webview: Webview, file: string) {
         fixedHeader: true
       });
       $("#data-table tbody").on("click", "tr", function() {
-        $(this).toggleClass("bg-dark text-light");
+        $(this).toggleClass("table-active");
       });
     });
   

From 5950348d04c19e8c1e319b99785742731f42156a Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Fri, 17 Jan 2020 13:48:17 +0900
Subject: [PATCH 109/795] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 3 ++-
 .github/ISSUE_TEMPLATE/feature_request.md | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c8625bbba..9b2fd8201 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: ''
+labels: bug
 assignees: ''
 
 ---
@@ -59,6 +59,7 @@ A clear and concise description of what you expected to happen.
 
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
+You can show the keybord contents by pressing `F1` and `Developer: toggle screencast mode`
 
 **Environment (please complete the following information):**
  - OS: [e.g. iOS]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7d6..982a4dc0d 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: ''
+labels: feature-request
 assignees: ''
 
 ---

From 6d5e8b015c7e08d39e620b1524d7d1c5e846c9af Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 21 Jan 2020 16:48:24 +0800
Subject: [PATCH 110/795] Fix dataview_table handling single row data

---
 R/init.R | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/R/init.R b/R/init.R
index 99fe6faf0..55a1964a1 100644
--- a/R/init.R
+++ b/R/init.R
@@ -93,13 +93,14 @@ if (interactive() && !identical(Sys.getenv("RSTUDIO"), "1")) {
             } else {
               rownames <- seq_len(nrow(data))
             }
-            data <- cbind(rownames, data, stringsAsFactors = FALSE)
+            data <- cbind(" " = rownames, data, stringsAsFactors = FALSE)
             colnames <- c(" ", colnames)
             types <- vapply(data, dataview_data_type,
               character(1L), USE.NAMES = FALSE)
             data <- vapply(data, function(x) {
               trimws(format(x))
             }, character(nrow(data)), USE.NAMES = FALSE)
+            dim(data) <- c(length(rownames), length(colnames))
           } else if (is.matrix(data)) {
             if (is.factor(data)) {
               data <- format(data)
@@ -117,13 +118,14 @@ if (interactive() && !identical(Sys.getenv("RSTUDIO"), "1")) {
             data <- trimws(format(data))
             if (is.null(rownames)) {
               types <- c("num", types)
-              colnames <- c(" ", colnames)
-              data <- cbind(" " = seq_len(nrow(data)), data)
+              rownames <- seq_len(nrow(data))
             } else {
               types <- c("string", types)
-              colnames <- c(" ", colnames)
-              data <- cbind(" " = trimws(rownames), data)
+              rownames <- trimws(rownames)
             }
+            dim(data) <- c(length(rownames), length(colnames))
+            colnames <- c(" ", colnames)
+            data <- cbind(rownames, data)
           } else {
             stop("data must be data.frame or matrix")
           }

From 4992240308c8ef0834f806d0194235b27b315f3a Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 21 Jan 2020 23:00:17 +0800
Subject: [PATCH 111/795] Provide bracket completion with condition

---
 src/extension.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index 9450e70f7..4147d1cf0 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -233,10 +233,11 @@ export function activate(context: ExtensionContext) {
                         items.push(item);
                     });
                 }
-                
-                // object elements in brackets
-                getBracketCompletionItems(document, position, token, items);
-                
+
+                if (context.triggerCharacter === undefined || context.triggerCharacter === '"' || context.triggerCharacter === "'") {
+                    getBracketCompletionItems(document, position, token, items);
+                }
+
                 return items;
             },
         }, "", "$", "@", '"', "'");

From 72b5c49a80409c79b4a2f7b1a83c64fb39a023f5 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 22 Jan 2020 10:58:12 +0800
Subject: [PATCH 112/795] Fix usage of CancellationToken

---
 src/extension.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index 4147d1cf0..9623e4137 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -178,12 +178,11 @@ export function activate(context: ExtensionContext) {
                 }
             }
 
-            if (symbol != undefined) {
+            if (!token.isCancellationRequested && symbol != undefined) {
                 const obj = globalenv[symbol];
                 if (obj != undefined && obj.names != undefined) {
                     const doc = new MarkdownString("Element of `" + symbol + "`");
                     obj.names.map((name: string) => {
-                        if (token.isCancellationRequested) return;
                         const item = new CompletionItem(name, CompletionItemKind.Field)
                         item.detail = "[session]";
                         item.documentation = doc;
@@ -196,11 +195,10 @@ export function activate(context: ExtensionContext) {
         languages.registerCompletionItemProvider("r", {
             provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken, context: CompletionContext) {
                 let items = [];
+                if (token.isCancellationRequested) return items;
 
                 if (context.triggerCharacter === undefined) {
                     Object.keys(globalenv).map((key) => {
-                        if (token.isCancellationRequested)
-                            return items;
                         const obj = globalenv[key];
                         const item = new CompletionItem(key,
                             obj.type === "closure" || obj.type === "builtin" ?
@@ -225,8 +223,6 @@ export function activate(context: ExtensionContext) {
                         }
                     }
                     elements.map((key) => {
-                        if (token.isCancellationRequested)
-                            return items;
                         const item = new CompletionItem(key, CompletionItemKind.Field);
                         item.detail = "[session]";
                         item.documentation = doc;

From 5d47b6e9334f11bdca7963c69b00d6d661bbf1e7 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Thu, 9 Jan 2020 09:36:53 +0800
Subject: [PATCH 113/795] Use dev.args option when creating png device before
 replay

---
 R/init.R | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/R/init.R b/R/init.R
index 387fbef35..852d4416d 100644
--- a/R/init.R
+++ b/R/init.R
@@ -72,7 +72,8 @@ if (interactive() && !identical(Sys.getenv("RSTUDIO"), "1")) {
               plot_updated <<- FALSE
               record <- recordPlot()
               if (length(record[[1]])) {
-                png(plot_file)
+                dev_args <- getOption("dev.args")
+                do.call(png, c(list(filename = plot_file), dev_args))
                 on.exit({
                   dev.off()
                   if (!is.null(plot_history_file)) {

From 9107d9b1dc2eb6a4fc12ac822b342ba954a4278c Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Fri, 10 Jan 2020 15:26:01 +0800
Subject: [PATCH 114/795] Update session watcher section in README.md

---
 README.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 96165f4af..1e13a4007 100644
--- a/README.md
+++ b/README.md
@@ -75,12 +75,23 @@ An opt-in experimental R session watcher is implemented to support the following
 * Show plot output on update
 * Show htmlwidgets and shiny apps
 
-To enable this feature, turn on `r.sessionWatcher` and append the following code to your `.Rprofile` (in your home directory):
+To enable this feature, turn on `r.sessionWatcher` and then edit your `.Rprofile` by running the following code in R:
 
 ```r
-source(file.path(if (.Platform$OS.type == "windows") file.path(Sys.getenv("HOMEDRIVE"), Sys.getenv("HOMEPATH")) else Sys.getenv("HOME"), ".vscode-R", "init.R"))
+system2("code", normalizePath("~/.Rprofile"))
 ```
 
+It will open a VSCode tab for you to edit the file. You may change `code` to whatever editor you like.
+
+Then append the following code to the file you get in the output of above command:
+
+```r
+source(file.path(Sys.getenv(if (.Platform$OS.type == "windows") "USERPROFILE" else "HOME"), ".vscode-R", "init.R"))
+```
+
+If the workspace folder you open in VSCode already has a `.Rprofile`, you need to append the code above in this file too because `~/.Rprofile` will not
+be executed when a local `.Rprofile` is found.
+
 This script writes the metadata of symbols in the global environment and plot file to `${workspaceFolder}/.vscode/vscode-R/PID` where `PID` is the R process ID. It also captures user input and append command lines to `${workspaceFolder}/.vscode/vscode-R/response.log`, which enables the communication between vscode-R and a live R sesson.
 
 Each time the extension is activated, the latest session watcher script (`init.R`) will be deployed to `~/.vscode-R/init.R`.

From ac91a398b4fd9aa12276b5b3b82f972fa82310c8 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Fri, 10 Jan 2020 16:45:59 +0800
Subject: [PATCH 115/795] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1e13a4007..4301c6529 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ system2("code", normalizePath("~/.Rprofile"))
 
 It will open a VSCode tab for you to edit the file. You may change `code` to whatever editor you like.
 
-Then append the following code to the file you get in the output of above command:
+Then append the following code to the file:
 
 ```r
 source(file.path(Sys.getenv(if (.Platform$OS.type == "windows") "USERPROFILE" else "HOME"), ".vscode-R", "init.R"))

From 9c29090e7924845f5e96cb0b532918355ab3dc37 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Fri, 10 Jan 2020 21:08:44 +0800
Subject: [PATCH 116/795] Update README.md

---
 README.md | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 4301c6529..db7c9aa18 100644
--- a/README.md
+++ b/README.md
@@ -75,19 +75,25 @@ An opt-in experimental R session watcher is implemented to support the following
 * Show plot output on update
 * Show htmlwidgets and shiny apps
 
-To enable this feature, turn on `r.sessionWatcher` and then edit your `.Rprofile` by running the following code in R:
+To enable this feature, follow the following steps:
 
-```r
-system2("code", normalizePath("~/.Rprofile"))
-```
+1. Turn on `r.sessionWatcher` in VSCode settings.
+2. Locate `.Rprofile` in your home directory by running the following code in R:
 
-It will open a VSCode tab for you to edit the file. You may change `code` to whatever editor you like.
+    ```r
+    normalizePath("~/.Rprofile")
+    ```
 
-Then append the following code to the file:
+    Following are typical paths in different operating systems:
+    * Windows: `C:\\Users\\user\\Documents\\.Rprofile`
+    * Linux: `/home/user/.Rprofile`
+    * macOS: `/Users/user/.Rprofile`
 
-```r
-source(file.path(Sys.getenv(if (.Platform$OS.type == "windows") "USERPROFILE" else "HOME"), ".vscode-R", "init.R"))
-```
+3. Create (if not exists) or open the file and append the following code to the file:
+
+    ```r
+    source(file.path(Sys.getenv(if (.Platform$OS.type == "windows") "USERPROFILE" else "HOME"), ".vscode-R", "init.R"))
+    ```
 
 If the workspace folder you open in VSCode already has a `.Rprofile`, you need to append the code above in this file too because `~/.Rprofile` will not
 be executed when a local `.Rprofile` is found.
@@ -102,7 +108,7 @@ R sessions started from the workspace root folder will be automatically attached
 * R session started by vscode-R or user
 * R session in a `tmux` or `screen` window
 * Switch between multiple running R sessions
-* [Remote Development](https://code.visualstudio.com/docs/remote/remote-overview)
+* [Remote Development](https://code.visualstudio.com/docs/remote/remote-overview) via SSH, WSL and Docker
 
 The status bar item shows the process id of the attached R session. Click the status bar item and it will
 attach to currently active session.

From fc13c713f89c34bbad53865b2669a8b2f19b1851 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Fri, 10 Jan 2020 21:15:54 +0800
Subject: [PATCH 117/795] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index db7c9aa18..b2e6ff636 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,8 @@ To enable this feature, follow the following steps:
     source(file.path(Sys.getenv(if (.Platform$OS.type == "windows") "USERPROFILE" else "HOME"), ".vscode-R", "init.R"))
     ```
 
+4. Restart or Reload Window in VSCode
+
 If the workspace folder you open in VSCode already has a `.Rprofile`, you need to append the code above in this file too because `~/.Rprofile` will not
 be executed when a local `.Rprofile` is found.
 

From 7ed6c068fe1e9551c862f1b3216a4673024c1577 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Thu, 16 Jan 2020 11:51:12 +0800
Subject: [PATCH 118/795] Add link and short description of radian

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index b2e6ff636..4d9b3e767 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,9 @@ attach to currently active session.
 
 ![R session watcher](https://user-images.githubusercontent.com/4662568/70815935-65391480-1e09-11ea-9ad6-7ebbebf9a9c8.gif)
 
+*The R terminal used in the screenshot is [radian](https://github.com/randy3k/radian) which is cross-platform and
+supports syntax highlighting, auto-completion and many other features.*
+
 ## TODO
 
 * Debug

From 3f600c1c6cfdcccd6cbdb70a4022370f67c149f5 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 21 Jan 2020 12:30:47 +0800
Subject: [PATCH 119/795] Use R_PROFILE_USER

---
 R/.Rprofile      |  9 +++++++++
 src/rTerminal.ts | 17 +++++++++++++++--
 src/session.ts   |  6 +++---
 3 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 R/.Rprofile

diff --git a/R/.Rprofile b/R/.Rprofile
new file mode 100644
index 000000000..977325106
--- /dev/null
+++ b/R/.Rprofile
@@ -0,0 +1,9 @@
+if (file.exists(".Rprofile")) {
+  source(".Rprofile")
+} else if (file.exists("~/.Rprofile")) {
+  source("~/.Rprofile")
+}
+
+if (is.null(getOption("vscodeR"))) {
+  source(file.path(Sys.getenv(if (.Platform$OS.type == "windows") "USERPROFILE" else "HOME"), ".vscode-R", "init.R"))
+}
diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index f492c0843..604caec10 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -1,8 +1,11 @@
 "use strict";
 
+import os = require("os");
+import path = require("path");
+
 import { pathExists } from "fs-extra";
 import { isDeepStrictEqual } from "util";
-import { commands, Terminal, window } from "vscode";
+import { commands, Terminal, window, TerminalOptions } from "vscode";
 
 import { getSelection } from "./selection";
 import { removeSessionFiles } from "./session";
@@ -18,7 +21,17 @@ export function createRTerm(preserveshow?: boolean): boolean {
         const termOpt: string[] = config.get("rterm.option");
         pathExists(termPath, (err, exists) => {
             if (exists) {
-                rTerm = window.createTerminal(termName, termPath, termOpt);
+                let termOptions: TerminalOptions = {
+                    name: termName,
+                    shellPath: termPath,
+                    shellArgs: termOpt
+                };
+                if (config.get("sessionWatcher")) {
+                    termOptions.env = {
+                        R_PROFILE_USER: path.join(os.homedir(), ".vscode-R", ".Rprofile")
+                    };
+                }
+                rTerm = window.createTerminal(termOptions);
                 rTerm.show(preserveshow);
                 return true;
             }
diff --git a/src/session.ts b/src/session.ts
index 5571d34ba..97a53b639 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -20,13 +20,13 @@ const sessionDir = path.join(".vscode", "vscode-R");
 
 export function deploySessionWatcher(extensionPath: string) {
     resDir = path.join(extensionPath, "dist", "resources");
-    const srcPath = path.join(extensionPath, "R", "init.R");
     const targetDir = path.join(os.homedir(), ".vscode-R");
     if (!fs.existsSync(targetDir)) {
         fs.mkdirSync(targetDir);
     }
-    const targetPath = path.join(targetDir, "init.R");
-    fs.copySync(srcPath, targetPath);
+
+    fs.copySync(path.join(extensionPath, "R", "init.R"), path.join(targetDir, "init.R"));
+    fs.copySync(path.join(extensionPath, "R", ".Rprofile"), path.join(targetDir, ".Rprofile"));
 }
 
 export function startResponseWatcher(sessionStatusBarItem: StatusBarItem) {

From 54c5f100f0338f2e84324be578bc82fb0084f6f3 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 21 Jan 2020 12:32:37 +0800
Subject: [PATCH 120/795] init.R only work with TERM_PROGRAM=vscode

---
 R/init.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/init.R b/R/init.R
index 387fbef35..3aac1e5a6 100644
--- a/R/init.R
+++ b/R/init.R
@@ -1,4 +1,4 @@
-if (interactive() && !identical(Sys.getenv("RSTUDIO"), "1")) {
+if (interactive() && Sys.getenv("TERM_PROGRAM") == "vscode") {
   if (requireNamespace("jsonlite", quietly = TRUE)) {
     local({
       pid <- Sys.getpid()

From c4b1e8887766380b8450afc4e0d7e1ac96353992 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 21 Jan 2020 13:18:12 +0800
Subject: [PATCH 121/795] Update README.md

---
 README.md | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 4d9b3e767..639e913d8 100644
--- a/README.md
+++ b/README.md
@@ -71,25 +71,28 @@ An opt-in experimental R session watcher is implemented to support the following
 * Watch any R session
 * Show value of session symbol on hover
 * Provide completion for session symbol
-* `View()` data frames and list objects
+* `View()` any objects including data frames and list objects
 * Show plot output on update
-* Show htmlwidgets and shiny apps
+* Show htmlwidgets, documentation and shiny apps in WebView
 
-To enable this feature, follow the following steps:
+### Basic usage
+
+To enable this feature, turn on `r.sessionWatcher` in VSCode settings, reload or restart VSCode, and the session watcher will be activated automatically
+on R sessions launched by vscode-R via `R: Create R Terminal` command.
+
+### Advanced usage (for self-managed R sessions)
+
+For advanced users to work with self-managed R sessions (e.g. manually started R terminal in `tmux` or `screen` window), some extra
+configuration is needed. Follow the steps below to make R session watcher work with any external R session:
 
 1. Turn on `r.sessionWatcher` in VSCode settings.
-2. Locate `.Rprofile` in your home directory by running the following code in R:
+2. Edit `.Rprofile` in your home directory by running the following code in R:
 
     ```r
-    normalizePath("~/.Rprofile")
+    file.edit("~/.Rprofile")
     ```
 
-    Following are typical paths in different operating systems:
-    * Windows: `C:\\Users\\user\\Documents\\.Rprofile`
-    * Linux: `/home/user/.Rprofile`
-    * macOS: `/Users/user/.Rprofile`
-
-3. Create (if not exists) or open the file and append the following code to the file:
+3. Append the following code to the file:
 
     ```r
     source(file.path(Sys.getenv(if (.Platform$OS.type == "windows") "USERPROFILE" else "HOME"), ".vscode-R", "init.R"))
@@ -100,6 +103,17 @@ To enable this feature, follow the following steps:
 If the workspace folder you open in VSCode already has a `.Rprofile`, you need to append the code above in this file too because `~/.Rprofile` will not
 be executed when a local `.Rprofile` is found.
 
+The script only works with environment variable `TERM_PROGRAM=vscode`. the script will not take effect with R sessions started in a `tmux` or `screen` window that does not have it, unless this environment variable is manually set before sourcing `init.R`, for example, you may insert a line `Sys.setenv(TERM_PROGRAM="vscode")` before it.
+
+### How to disable it
+
+For the case of basic usage, turning off `r.sessionWatcher` in VSCode settings is sufficient
+to disable R session watcher.
+
+For the case of advanced usage, user should, in addition, comment out or remove the `source(...)` line appended to `~/.Rprofile`.
+
+### How it works
+
 This script writes the metadata of symbols in the global environment and plot file to `${workspaceFolder}/.vscode/vscode-R/PID` where `PID` is the R process ID. It also captures user input and append command lines to `${workspaceFolder}/.vscode/vscode-R/response.log`, which enables the communication between vscode-R and a live R sesson.
 
 Each time the extension is activated, the latest session watcher script (`init.R`) will be deployed to `~/.vscode-R/init.R`.

From 8a07532a558b26d82b70729b26e6791fca8b2d21 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 21 Jan 2020 13:34:27 +0800
Subject: [PATCH 122/795] Respect existing R_PROFILE_USER

---
 R/.Rprofile      | 4 +++-
 src/rTerminal.ts | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/R/.Rprofile b/R/.Rprofile
index 977325106..324e475a5 100644
--- a/R/.Rprofile
+++ b/R/.Rprofile
@@ -1,4 +1,6 @@
-if (file.exists(".Rprofile")) {
+if (nzchar(Sys.getenv("R_PROFILE_USER_OLD"))) {
+  source(Sys.getenv("R_PROFILE_USER_OLD"))
+} else if (file.exists(".Rprofile")) {
   source(".Rprofile")
 } else if (file.exists("~/.Rprofile")) {
   source("~/.Rprofile")
diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index 604caec10..c59a5cef3 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -28,6 +28,7 @@ export function createRTerm(preserveshow?: boolean): boolean {
                 };
                 if (config.get("sessionWatcher")) {
                     termOptions.env = {
+                        R_PROFILE_USER_OLD: process.env.R_PROFILE_USER,
                         R_PROFILE_USER: path.join(os.homedir(), ".vscode-R", ".Rprofile")
                     };
                 }

From 9bd4ab54afff383e15101a82eecb5e2c5cd5cc0a Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 21 Jan 2020 14:10:33 +0800
Subject: [PATCH 123/795] Update README.md

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 639e913d8..49c8519a7 100644
--- a/README.md
+++ b/README.md
@@ -80,9 +80,12 @@ An opt-in experimental R session watcher is implemented to support the following
 To enable this feature, turn on `r.sessionWatcher` in VSCode settings, reload or restart VSCode, and the session watcher will be activated automatically
 on R sessions launched by vscode-R via `R: Create R Terminal` command.
 
+*If you previously appended the `source(...)` line to `~/.Rprofile`, you may safely remove it since the configuration for basic usage is automated. It is
+now only necessary for advanced usage described below.*
+
 ### Advanced usage (for self-managed R sessions)
 
-For advanced users to work with self-managed R sessions (e.g. manually started R terminal in `tmux` or `screen` window), some extra
+For advanced users to work with self-managed R sessions (e.g. manually launched R terminal or started in `tmux` or `screen` window), some extra
 configuration is needed. Follow the steps below to make R session watcher work with any external R session:
 
 1. Turn on `r.sessionWatcher` in VSCode settings.

From 75a5edd8bb0c4ed42b4e955749550f1337972cc0 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Fri, 24 Jan 2020 16:54:01 +0800
Subject: [PATCH 124/795] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 49c8519a7..386bf1832 100644
--- a/README.md
+++ b/README.md
@@ -69,10 +69,10 @@ This extension contributes the following settings:
 An opt-in experimental R session watcher is implemented to support the following features:
 
 * Watch any R session
-* Show value of session symbol on hover
-* Provide completion for session symbol
+* Show value of session symbols on hover
+* Provide completion for session symbols
 * `View()` any objects including data frames and list objects
-* Show plot output on update
+* Show plot output on update and plot history
 * Show htmlwidgets, documentation and shiny apps in WebView
 
 ### Basic usage

From 5c52841a8d099ca8c674502ecb70af661ddb8c95 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Sun, 26 Jan 2020 15:59:10 +0900
Subject: [PATCH 125/795] version 1.2.2

---
 CHANGELOG.md      | 11 +++++++++++
 package-lock.json | 36 ++++++++++++++++++------------------
 package.json      |  4 ++--
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 829018d90..8be55ffa9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## 1.2.2
+
+* View improvement (Thank you @renkun-ken)
+    * Fix dataview_table handling single row data
+    * Show WebView triggered by page_viewer in Active column
+    * Fix WebView Uri replacing
+    * Add row hover and select
+    * Improve session watcher initialization
+    * Use dev.args option when creating png device before replay
+    * Show plot history
+
 ## 1.2.1
 
 * Extend View (Thank you @renkun-ken)
diff --git a/package-lock.json b/package-lock.json
index 372de107d..c7953d3e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,22 +1,22 @@
 {
   "name": "r",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+      "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.0.0"
+        "@babel/highlight": "^7.8.3"
       }
     },
     "@babel/highlight": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
-      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
+      "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
       "dev": true,
       "requires": {
         "chalk": "^2.0.0",
@@ -4950,9 +4950,9 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
+      "integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
       "dev": true,
       "requires": {
         "path-parse": "^1.0.6"
@@ -5711,9 +5711,9 @@
       "dev": true
     },
     "tslint": {
-      "version": "5.20.1",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz",
-      "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.0.0.tgz",
+      "integrity": "sha512-9nLya8GBtlFmmFMW7oXXwoXS1NkrccqTqAtwXzdPV9e2mqSEvCki6iHL/Fbzi5oqbugshzgGPk7KBb2qNP1DSA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -5727,7 +5727,7 @@
         "mkdirp": "^0.5.1",
         "resolve": "^1.3.2",
         "semver": "^5.3.0",
-        "tslib": "^1.8.0",
+        "tslib": "^1.10.0",
         "tsutils": "^2.29.0"
       },
       "dependencies": {
@@ -5738,9 +5738,9 @@
           "dev": true
         },
         "diff": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
-          "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
           "dev": true
         }
       }
diff --git a/package.json b/package.json
index 06b7d9503..e32c431bd 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "r",
   "displayName": "R",
   "description": "Support for R language(run,syntax,snippet)",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "author": "Yuki Ueda",
   "license": "SEE LICENSE IN LICENSE",
   "publisher": "Ikuyadeu",
@@ -398,7 +398,7 @@
     "mocha": "^6.2.2",
     "node-atomizr": "^0.6.1",
     "ts-loader": "^6.2.0",
-    "tslint": "^5.20.1",
+    "tslint": "^6.0.0",
     "typescript": "^3.6.3",
     "webpack": "^4.41.2",
     "webpack-cli": "^3.3.9",

From 9a53b4812e7b44d0edf2805ad863efdabb879dea Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Sun, 26 Jan 2020 16:04:11 +0900
Subject: [PATCH 126/795] style fix

---
 package-lock.json |  6 +++---
 package.json      |  2 +-
 src/extension.ts  | 25 ++++++++++++++-----------
 src/session.ts    |  3 ++-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c7953d3e4..d88773c24 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5767,9 +5767,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz",
-      "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==",
+      "version": "3.7.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz",
+      "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==",
       "dev": true
     },
     "union-value": {
diff --git a/package.json b/package.json
index e32c431bd..896e1dcd5 100644
--- a/package.json
+++ b/package.json
@@ -399,7 +399,7 @@
     "node-atomizr": "^0.6.1",
     "ts-loader": "^6.2.0",
     "tslint": "^6.0.0",
-    "typescript": "^3.6.3",
+    "typescript": "^3.7.5",
     "webpack": "^4.41.2",
     "webpack-cli": "^3.3.9",
     "yamljs": "^0.3.0"
diff --git a/src/extension.ts b/src/extension.ts
index 35f863599..e969a46f1 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -161,8 +161,9 @@ export function activate(context: ExtensionContext) {
                     const chr = text.charAt(i);
                     if (chr === "]") {
                         expectOpenBrackets++;
+                    // tslint:disable-next-line: triple-equals
                     } else if (chr == "[") {
-                        if (expectOpenBrackets == 0) {
+                        if (expectOpenBrackets === 0) {
                             const symbolPosition = new Position(range.start.line, i - 1);
                             const symbolRange = document.getWordRangeAtPosition(symbolPosition);
                             symbol = document.getText(symbolRange);
@@ -179,9 +180,9 @@ export function activate(context: ExtensionContext) {
                 }
             }
 
-            if (!token.isCancellationRequested && symbol != undefined) {
+            if (!token.isCancellationRequested && symbol !== undefined) {
                 const obj = globalenv[symbol];
-                if (obj != undefined && obj.names != undefined) {
+                if (obj !== undefined && obj.names !== undefined) {
                     const doc = new MarkdownString("Element of `" + symbol + "`");
                     obj.names.map((name: string) => {
                         const item = new CompletionItem(name, CompletionItemKind.Field)
@@ -194,11 +195,11 @@ export function activate(context: ExtensionContext) {
         }
 
         languages.registerCompletionItemProvider("r", {
-            provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken, context: CompletionContext) {
-                let items = [];
+            provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken, completionContext: CompletionContext) {
+                const items = [];
                 if (token.isCancellationRequested) return items;
 
-                if (context.triggerCharacter === undefined) {
+                if (completionContext.triggerCharacter === undefined) {
                     Object.keys(globalenv).map((key) => {
                         const obj = globalenv[key];
                         const item = new CompletionItem(key,
@@ -209,17 +210,17 @@ export function activate(context: ExtensionContext) {
                         item.documentation = new MarkdownString("```r\n" + obj.str + "\n```");
                         items.push(item);
                     });
-                } else if (context.triggerCharacter === "$" || context.triggerCharacter === "@") {
+                } else if (completionContext.triggerCharacter === "$" || completionContext.triggerCharacter === "@") {
                     const symbolPosition = new Position(position.line, position.character - 1);
                     const symbolRange = document.getWordRangeAtPosition(symbolPosition);
                     const symbol = document.getText(symbolRange);
                     const doc = new MarkdownString("Element of `" + symbol + "`");
                     const obj = globalenv[symbol];
                     let elements: string[];
-                    if (obj != undefined) {
-                        if (context.triggerCharacter === "$") {
+                    if (obj !== undefined) {
+                        if (completionContext.triggerCharacter === "$") {
                             elements = obj.names;
-                        } else if (context.triggerCharacter === "@") {
+                        } else if (completionContext.triggerCharacter === "@") {
                             elements = obj.slots;
                         }
                     }
@@ -231,7 +232,9 @@ export function activate(context: ExtensionContext) {
                     });
                 }
 
-                if (context.triggerCharacter === undefined || context.triggerCharacter === '"' || context.triggerCharacter === "'") {
+                if (completionContext.triggerCharacter === undefined ||
+                    completionContext.triggerCharacter === '"' ||
+                    completionContext.triggerCharacter === "'") {
                     getBracketCompletionItems(document, position, token, items);
                 }
 
diff --git a/src/session.ts b/src/session.ts
index 97a53b639..f4103ddba 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -1,3 +1,4 @@
+// tslint:disable: no-console
 "use strict";
 
 import fs = require("fs-extra");
@@ -156,7 +157,7 @@ async function showWebView(file: string, viewColumn: ViewColumn) {
     const panel = window.createWebviewPanel("webview", "WebView",
         {
             preserveFocus: true,
-            viewColumn: viewColumn,
+            viewColumn,
         },
         {
             enableScripts: true,

From c325c1fe33fde1a8f3d3126e5a39062b8e8ffbf1 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Mon, 13 Jan 2020 18:14:36 +0800
Subject: [PATCH 127/795] Add logging to session watcher

---
 src/extension.ts |  4 +++-
 src/session.ts   | 49 +++++++++++++++++++++++++++++++++++-------------
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index e969a46f1..9e392a29a 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -140,6 +140,7 @@ export function activate(context: ExtensionContext) {
     );
 
     if (config.get("sessionWatcher")) {
+        console.info("Initialize session watcher");
         languages.registerHoverProvider("r", {
             provideHover(document, position, token) {
                 const wordRange = document.getWordRangeAtPosition(position);
@@ -242,13 +243,14 @@ export function activate(context: ExtensionContext) {
             },
         }, "", "$", "@", '"', "'");
 
+        console.info("Create sessionStatusBarItem");
         const sessionStatusBarItem = window.createStatusBarItem(StatusBarAlignment.Right, 1000);
         sessionStatusBarItem.command = "r.attachActive";
         sessionStatusBarItem.text = "R: (not attached)";
         sessionStatusBarItem.tooltip = "Attach Active Terminal";
         context.subscriptions.push(sessionStatusBarItem);
         sessionStatusBarItem.show();
-
+        
         deploySessionWatcher(context.extensionPath);
         startResponseWatcher(sessionStatusBarItem);
     }
diff --git a/src/session.ts b/src/session.ts
index f4103ddba..4ed40672d 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -20,27 +20,35 @@ let resDir: string;
 const sessionDir = path.join(".vscode", "vscode-R");
 
 export function deploySessionWatcher(extensionPath: string) {
+    console.info("[deploySessionWatcher] extensionPath: " + extensionPath);
     resDir = path.join(extensionPath, "dist", "resources");
     const targetDir = path.join(os.homedir(), ".vscode-R");
+    console.info("[deploySessionWatcher] targetDir: " + targetDir);
     if (!fs.existsSync(targetDir)) {
+        console.info("[deploySessionWatcher] targetDir not exists, create directory");
         fs.mkdirSync(targetDir);
     }
-
+    console.info("[deploySessionWatcher] Deploy init.R");
     fs.copySync(path.join(extensionPath, "R", "init.R"), path.join(targetDir, "init.R"));
+    console.info("[deploySessionWatcher] Deploy .Rprofile");
     fs.copySync(path.join(extensionPath, "R", ".Rprofile"), path.join(targetDir, ".Rprofile"));
+    console.info("[deploySessionWatcher] Done");
 }
 
 export function startResponseWatcher(sessionStatusBarItem: StatusBarItem) {
+    console.info("[startResponseWatcher] Starting");
     responseWatcher = workspace.createFileSystemWatcher(
         new RelativePattern(
             workspace.workspaceFolders[0],
             path.join(".vscode", "vscode-R", "response.log")));
     responseWatcher.onDidCreate(() => updateResponse(sessionStatusBarItem));
     responseWatcher.onDidChange(() => updateResponse(sessionStatusBarItem));
+    console.info("[startResponseWatcher] Done");
 }
 
 export function attachActive() {
     if (config.get("sessionWatcher")) {
+        console.info("[attachActive]");
         chooseTerminalAndSendText("getOption('vscodeR')$attach()");
     } else {
         window.showInformationMessage("This command requires that r.sessionWatcher be enabled.");
@@ -48,52 +56,61 @@ export function attachActive() {
 }
 
 function removeDirectory(dir: string) {
+    console.info("[removeDirectory] dir: " + dir);
     if (fs.existsSync(dir)) {
+        console.info("[removeDirectory] dir exists");
         fs.readdirSync(dir).forEach((file) => {
             const curPath = path.join(dir, file);
+            console.info("[removeDirectory] Remove " + curPath);
             fs.unlinkSync(curPath);
         });
+        console.info("[removeDirectory] Remove dir " + dir);
         fs.rmdirSync(dir);
     }
+    console.info("[removeDirectory] Done");
 }
 
 export function removeSessionFiles() {
     const sessionPath = path.join(
         workspace.workspaceFolders[0].uri.fsPath, sessionDir, PID);
-    console.info("removeSessionFiles: ", sessionPath);
+    console.info("[removeSessionFiles] ", sessionPath);
     if (fs.existsSync(sessionPath)) {
         removeDirectory(sessionPath);
     }
+    console.info("[removeSessionFiles] Done");
 }
 
 function updateSessionWatcher() {
-    console.info("Updating session to PID " + PID);
-    console.info("Create globalEnvWatcher");
+    console.info("[updateSessionWatcher] PID: " + PID);
+    console.info("[updateSessionWatcher] Create globalEnvWatcher");
     globalEnvWatcher = workspace.createFileSystemWatcher(
         new RelativePattern(
             workspace.workspaceFolders[0],
             path.join(sessionDir, PID, "globalenv.json")));
     globalEnvWatcher.onDidChange(updateGlobalenv);
 
-    console.info("Create plotWatcher");
+    console.info("[updateSessionWatcher] Create plotWatcher");
     plotWatcher = workspace.createFileSystemWatcher(
         new RelativePattern(
             workspace.workspaceFolders[0],
             path.join(sessionDir, PID, "plot.png")));
     plotWatcher.onDidCreate(updatePlot);
     plotWatcher.onDidChange(updatePlot);
+
+    console.info("[updateSessionWatcher] Done");
 }
 
 function _updatePlot() {
     const plotPath = path.join(workspace.workspaceFolders[0].uri.fsPath,
         sessionDir, PID, "plot.png");
+    console.info("[_updatePlot] " + plotPath);
     if (fs.existsSync(plotPath)) {
         commands.executeCommand("vscode.open", Uri.file(plotPath), {
             preserveFocus: true,
             preview: true,
             viewColumn: ViewColumn.Two,
         });
-        console.info("Updated plot");
+        console.info("[_updatePlot] Done");
     }
 }
 
@@ -104,9 +121,10 @@ function updatePlot(event) {
 async function _updateGlobalenv() {
     const globalenvPath = path.join(workspace.workspaceFolders[0].uri.fsPath,
         sessionDir, PID, "globalenv.json");
+    console.info("[_updateGlobalenv] " + globalenvPath);
     const content = await fs.readFile(globalenvPath, "utf8");
     globalenv = JSON.parse(content);
-    console.info("Updated globalenv");
+    console.info("[_updateGlobalenv] Done");
 }
 
 async function updateGlobalenv(event) {
@@ -114,7 +132,7 @@ async function updateGlobalenv(event) {
 }
 
 function showBrowser(url: string) {
-    console.info("browser uri: " + url);
+    console.info("[showBrowser] uri: " + url);
     const port = parseInt(new URL(url).port, 10);
     const panel = window.createWebviewPanel("browser", url,
         {
@@ -132,6 +150,7 @@ function showBrowser(url: string) {
             ],
         });
     panel.webview.html = getBrowserHtml(url);
+    console.info("[showBrowser] Done");
 }
 
 function getBrowserHtml(url: string) {
@@ -152,8 +171,8 @@ function getBrowserHtml(url: string) {
 }
 
 async function showWebView(file: string, viewColumn: ViewColumn) {
+    console.info("[showWebView] file: " + file);
     const dir = path.dirname(file);
-    console.info("webview uri: " + file);
     const panel = window.createWebviewPanel("webview", "WebView",
         {
             preserveFocus: true,
@@ -169,9 +188,11 @@ async function showWebView(file: string, viewColumn: ViewColumn) {
         .replace("", "
Date: Thu, 30 Jan 2020 13:56:36 +0900
Subject: [PATCH 128/795] Update FAQ

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 386bf1832..0916532ad 100644
--- a/README.md
+++ b/README.md
@@ -168,4 +168,9 @@ I hope you will join us.
 * Q: I can't use command and message is `xxx no command found`.
 * A: Please open your folder that has R source file
 
+* Q: About code formatter, completion, definition...
+* A: Please visit to the language server [issues](https://github.com/REditorSupport/languageserver/issues)
+
+Other past questions can be found from [StackOverflow](https://stackoverflow.com/questions/tagged/visual-studio-code+r) or [issues](https://github.com/Ikuyadeu/vscode-R/issues)
+
 The R logo is © 2016 The R Foundation

From 074a5b72fa20f3628f46fc0deff8b98c8c593412 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 29 Jan 2020 18:29:51 +0800
Subject: [PATCH 129/795] updateResponse only handles response when
 responseLineCount increases

---
 src/session.ts | 53 ++++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/session.ts b/src/session.ts
index 4ed40672d..17d6b560f 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -17,6 +17,7 @@ let PID: string;
 let tempDir: string;
 let plotDir: string;
 let resDir: string;
+let responseLineCount: number;
 const sessionDir = path.join(".vscode", "vscode-R");
 
 export function deploySessionWatcher(extensionPath: string) {
@@ -37,6 +38,7 @@ export function deploySessionWatcher(extensionPath: string) {
 
 export function startResponseWatcher(sessionStatusBarItem: StatusBarItem) {
     console.info("[startResponseWatcher] Starting");
+    responseLineCount = 0;
     responseWatcher = workspace.createFileSystemWatcher(
         new RelativePattern(
             workspace.workspaceFolders[0],
@@ -389,29 +391,34 @@ async function updateResponse(sessionStatusBarItem: StatusBarItem) {
     console.info("[updateResponse] responseLogFile: " + responseLogFile);
     const content = await fs.readFile(responseLogFile, "utf8");
     const lines = content.split("\n");
-    console.info("[updateResponse] lines: " + lines.length.toString());
-    const lastLine = lines[lines.length - 2];
-    console.info("[updateResponse] lastLine: " + lastLine);
-    const parseResult = JSON.parse(lastLine);
-    if (parseResult.command === "attach") {
-        PID = String(parseResult.pid);
-        tempDir = parseResult.tempdir;
-        plotDir = path.join(tempDir, "images");
-        console.info("[updateResponse] attach PID: " + PID);
-        sessionStatusBarItem.text = "R: " + PID;
-        sessionStatusBarItem.show();
-        updateSessionWatcher();
-        _updateGlobalenv();
-        _updatePlot();
-    } else if (parseResult.command === "browser") {
-        showBrowser(parseResult.url);
-    } else if (parseResult.command === "webview") {
-        const viewColumn: string = parseResult.viewColumn;
-        showWebView(parseResult.file, ViewColumn[viewColumn]);
-    } else if (parseResult.command === "dataview") {
-        showDataView(parseResult.source,
-            parseResult.type, parseResult.title, parseResult.file);
+    if (lines.length > responseLineCount) {
+        responseLineCount = lines.length;
+        console.info("[updateResponse] lines: " + responseLineCount.toString());
+        const lastLine = lines[lines.length - 2];
+        console.info("[updateResponse] lastLine: " + lastLine);
+        const parseResult = JSON.parse(lastLine);
+        if (parseResult.command === "attach") {
+            PID = String(parseResult.pid);
+            tempDir = parseResult.tempdir;
+            plotDir = path.join(tempDir, "images");
+            console.info("[updateResponse] attach PID: " + PID);
+            sessionStatusBarItem.text = "R: " + PID;
+            sessionStatusBarItem.show();
+            updateSessionWatcher();
+            _updateGlobalenv();
+            _updatePlot();
+        } else if (parseResult.command === "browser") {
+            showBrowser(parseResult.url);
+        } else if (parseResult.command === "webview") {
+            const viewColumn: string = parseResult.viewColumn;
+            showWebView(parseResult.file, ViewColumn[viewColumn]);
+        } else if (parseResult.command === "dataview") {
+            showDataView(parseResult.source,
+                parseResult.type, parseResult.title, parseResult.file);
+        } else {
+            console.error("[updateResponse] Unsupported command: " + parseResult.command);
+        }
     } else {
-        console.error("Unsupported command: " + parseResult.command);
+        console.warn("[updateResponse] Duplicate update on response change");
     }
 }

From 1fc4a77b71a9760dbd8c726f9fa8ac9e60408563 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 29 Jan 2020 18:41:03 +0800
Subject: [PATCH 130/795] updateResponse only handles response when
 responseLineCount changes

---
 src/session.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/session.ts b/src/session.ts
index 17d6b560f..effdc13be 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -391,7 +391,7 @@ async function updateResponse(sessionStatusBarItem: StatusBarItem) {
     console.info("[updateResponse] responseLogFile: " + responseLogFile);
     const content = await fs.readFile(responseLogFile, "utf8");
     const lines = content.split("\n");
-    if (lines.length > responseLineCount) {
+    if (lines.length != responseLineCount) {
         responseLineCount = lines.length;
         console.info("[updateResponse] lines: " + responseLineCount.toString());
         const lastLine = lines[lines.length - 2];

From 4bf19ddd3f0eb64ddf790a078f166e547d459a3f Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Sun, 2 Feb 2020 16:19:40 +0900
Subject: [PATCH 131/795] first tslint cleanup

---
 src/extension.ts | 28 +++++++++--------
 src/lineCache.ts | 22 ++++++-------
 src/rTerminal.ts | 11 ++++---
 src/session.ts   | 82 ++++++++++++++++++++++++++----------------------
 src/util.ts      |  2 +-
 tslint.json      | 13 ++++++--
 6 files changed, 88 insertions(+), 70 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index 9e392a29a..6ae6e80d9 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -1,15 +1,16 @@
 "use strict";
 // The module 'vscode' contains the VS Code extensibility API
 // Import the module and reference it with the alias vscode in your code below
-import { commands, CompletionItem, ExtensionContext, Hover, IndentAction,
-         languages, Position, StatusBarAlignment, TextDocument, window, CompletionItemKind, MarkdownString, CompletionContext, Range, CancellationToken } from "vscode";
+import { CancellationToken, commands, CompletionContext, CompletionItem, CompletionItemKind,
+         ExtensionContext, Hover, IndentAction, languages, MarkdownString, Position, Range,
+         StatusBarAlignment, TextDocument, window } from "vscode";
 
 import { previewDataframe, previewEnvironment } from "./preview";
 import { createGitignore } from "./rGitignore";
 import { chooseTerminal, chooseTerminalAndSendText, createRTerm, deleteTerminal,
          runSelectionInTerm, runTextInTerm } from "./rTerminal";
 import { getWordOrSelection, surroundSelection } from "./selection";
-import { attachActive, deploySessionWatcher, globalenv, startResponseWatcher, showPlotHistory } from "./session";
+import { attachActive, deploySessionWatcher, globalenv, showPlotHistory, startResponseWatcher } from "./session";
 import { config, ToRStringLiteral } from "./util";
 
 const wordPattern = /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\<\>\/\s]+)/g;
@@ -139,12 +140,13 @@ export function activate(context: ExtensionContext) {
         window.onDidCloseTerminal(deleteTerminal),
     );
 
-    if (config.get("sessionWatcher")) {
+    if (config.get("sessionWatcher")) {
         console.info("Initialize session watcher");
         languages.registerHoverProvider("r", {
             provideHover(document, position, token) {
                 const wordRange = document.getWordRangeAtPosition(position);
                 const text = document.getText(wordRange);
+
                 return new Hover("```\n" + globalenv[text].str + "\n```");
             },
         });
@@ -156,12 +158,12 @@ export function activate(context: ExtensionContext) {
 
             loop1:
             while (range.start.line >= 0) {
-                if (token.isCancellationRequested) return;
+                if (token.isCancellationRequested) { return; }
                 const text = document.getText(range);
-                for (let i = text.length - 1; i >= 0; i--) {
+                for (let i = text.length - 1; i >= 0; i -= 1) {
                     const chr = text.charAt(i);
                     if (chr === "]") {
-                        expectOpenBrackets++;
+                        expectOpenBrackets += 1;
                     // tslint:disable-next-line: triple-equals
                     } else if (chr == "[") {
                         if (expectOpenBrackets === 0) {
@@ -170,7 +172,7 @@ export function activate(context: ExtensionContext) {
                             symbol = document.getText(symbolRange);
                             break loop1;
                         } else {
-                            expectOpenBrackets--;
+                            expectOpenBrackets -= 1;
                         }
                     }
                 }
@@ -186,7 +188,7 @@ export function activate(context: ExtensionContext) {
                 if (obj !== undefined && obj.names !== undefined) {
                     const doc = new MarkdownString("Element of `" + symbol + "`");
                     obj.names.map((name: string) => {
-                        const item = new CompletionItem(name, CompletionItemKind.Field)
+                        const item = new CompletionItem(name, CompletionItemKind.Field);
                         item.detail = "[session]";
                         item.documentation = doc;
                         items.push(item);
@@ -198,13 +200,13 @@ export function activate(context: ExtensionContext) {
         languages.registerCompletionItemProvider("r", {
             provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken, completionContext: CompletionContext) {
                 const items = [];
-                if (token.isCancellationRequested) return items;
+                if (token.isCancellationRequested) { return items; }
 
                 if (completionContext.triggerCharacter === undefined) {
                     Object.keys(globalenv).map((key) => {
                         const obj = globalenv[key];
                         const item = new CompletionItem(key,
-                            obj.type === "closure" || obj.type === "builtin" ?
+                                                        obj.type === "closure" || obj.type === "builtin" ?
                                 CompletionItemKind.Function :
                                 CompletionItemKind.Field);
                         item.detail = "[session]";
@@ -241,7 +243,7 @@ export function activate(context: ExtensionContext) {
 
                 return items;
             },
-        }, "", "$", "@", '"', "'");
+        },                                       "", "$", "@", '"', "'");
 
         console.info("Create sessionStatusBarItem");
         const sessionStatusBarItem = window.createStatusBarItem(StatusBarAlignment.Right, 1000);
@@ -250,7 +252,7 @@ export function activate(context: ExtensionContext) {
         sessionStatusBarItem.tooltip = "Attach Active Terminal";
         context.subscriptions.push(sessionStatusBarItem);
         sessionStatusBarItem.show();
-        
+
         deploySessionWatcher(context.extensionPath);
         startResponseWatcher(sessionStatusBarItem);
     }
diff --git a/src/lineCache.ts b/src/lineCache.ts
index 6f81b6a82..8dd550838 100644
--- a/src/lineCache.ts
+++ b/src/lineCache.ts
@@ -4,9 +4,9 @@
  * Class to hold lines that have been fetched from the document after they have been preprocessed.
  */
 export class LineCache {
-    public lineCache: Map;
     public endsInOperatorCache: Map;
     public getLine: (line: number) => string;
+    public lineCache: Map;
     public lineCount: number;
     public constructor(getLine: (line: number) => string, lineCount: number) {
         this.getLine = getLine;
@@ -14,30 +14,30 @@ export class LineCache {
         this.lineCache = new Map();
         this.endsInOperatorCache = new Map();
     }
-    public getLineFromCache(line: number) {
+    public addLineToCache(line: number) {
+        const cleaned = cleanLine(this.getLine(line));
+        const endsInOperator = doesLineEndInOperator(cleaned);
+        this.lineCache.set(line, cleaned);
+        this.endsInOperatorCache.set(line, endsInOperator);
+    }
+    public getEndsInOperatorFromCache(line: number) {
         const lineInCache = this.lineCache.has(line);
         if (!lineInCache) {
             this.addLineToCache(line);
         }
-        const s = this.lineCache.get(line);
+        const s = this.endsInOperatorCache.get(line);
 
         return (s);
     }
-    public getEndsInOperatorFromCache(line: number) {
+    public getLineFromCache(line: number) {
         const lineInCache = this.lineCache.has(line);
         if (!lineInCache) {
             this.addLineToCache(line);
         }
-        const s = this.endsInOperatorCache.get(line);
+        const s = this.lineCache.get(line);
 
         return (s);
     }
-    public addLineToCache(line: number) {
-        const cleaned = cleanLine(this.getLine(line));
-        const endsInOperator = doesLineEndInOperator(cleaned);
-        this.lineCache.set(line, cleaned);
-        this.endsInOperatorCache.set(line, endsInOperator);
-    }
 }
 
 function cleanLine(text: string) {
diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index c59a5cef3..f5da17b6e 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -5,7 +5,7 @@ import path = require("path");
 
 import { pathExists } from "fs-extra";
 import { isDeepStrictEqual } from "util";
-import { commands, Terminal, window, TerminalOptions } from "vscode";
+import { commands, Terminal, TerminalOptions, window } from "vscode";
 
 import { getSelection } from "./selection";
 import { removeSessionFiles } from "./session";
@@ -21,12 +21,12 @@ export function createRTerm(preserveshow?: boolean): boolean {
         const termOpt: string[] = config.get("rterm.option");
         pathExists(termPath, (err, exists) => {
             if (exists) {
-                let termOptions: TerminalOptions = {
+                const termOptions: TerminalOptions = {
                     name: termName,
                     shellPath: termPath,
-                    shellArgs: termOpt
+                    shellArgs: termOpt,
                 };
-                if (config.get("sessionWatcher")) {
+                if (config.get("sessionWatcher")) {
                     termOptions.env = {
                         R_PROFILE_USER_OLD: process.env.R_PROFILE_USER,
                         R_PROFILE_USER: path.join(os.homedir(), ".vscode-R", ".Rprofile")
@@ -34,6 +34,7 @@ export function createRTerm(preserveshow?: boolean): boolean {
                 }
                 rTerm = window.createTerminal(termOptions);
                 rTerm.show(preserveshow);
+
                 return true;
             }
             window.showErrorMessage("Cannot find R client.  Please check R path in preferences and reload.");
@@ -44,7 +45,7 @@ export function createRTerm(preserveshow?: boolean): boolean {
 
 export function deleteTerminal(term: Terminal) {
     if (isDeepStrictEqual(term, rTerm)) {
-        if (config.get("sessionWatcher")) {
+        if (config.get("sessionWatcher")) {
             removeSessionFiles();
         }
         rTerm = undefined;
diff --git a/src/session.ts b/src/session.ts
index effdc13be..73a31fb63 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -6,6 +6,7 @@ import os = require("os");
 import path = require("path");
 import { URL } from "url";
 import { commands, FileSystemWatcher, RelativePattern, StatusBarItem, Uri, ViewColumn, Webview, window, workspace } from "vscode";
+
 import { chooseTerminalAndSendText } from "./rTerminal";
 import { config } from "./util";
 
@@ -49,7 +50,7 @@ export function startResponseWatcher(sessionStatusBarItem: StatusBarItem) {
 }
 
 export function attachActive() {
-    if (config.get("sessionWatcher")) {
+    if (config.get("sessionWatcher")) {
         console.info("[attachActive]");
         chooseTerminalAndSendText("getOption('vscodeR')$attach()");
     } else {
@@ -104,7 +105,7 @@ function updateSessionWatcher() {
 
 function _updatePlot() {
     const plotPath = path.join(workspace.workspaceFolders[0].uri.fsPath,
-        sessionDir, PID, "plot.png");
+                               sessionDir, PID, "plot.png");
     console.info("[_updatePlot] " + plotPath);
     if (fs.existsSync(plotPath)) {
         commands.executeCommand("vscode.open", Uri.file(plotPath), {
@@ -122,7 +123,7 @@ function updatePlot(event) {
 
 async function _updateGlobalenv() {
     const globalenvPath = path.join(workspace.workspaceFolders[0].uri.fsPath,
-        sessionDir, PID, "globalenv.json");
+                                    sessionDir, PID, "globalenv.json");
     console.info("[_updateGlobalenv] " + globalenvPath);
     const content = await fs.readFile(globalenvPath, "utf8");
     globalenv = JSON.parse(content);
@@ -136,7 +137,9 @@ async function updateGlobalenv(event) {
 function showBrowser(url: string) {
     console.info("[showBrowser] uri: " + url);
     const port = parseInt(new URL(url).port, 10);
-    const panel = window.createWebviewPanel("browser", url,
+    const panel = window.createWebviewPanel(
+        "browser",
+        url,
         {
             preserveFocus: true,
             viewColumn: ViewColumn.Active,
@@ -176,11 +179,11 @@ async function showWebView(file: string, viewColumn: ViewColumn) {
     console.info("[showWebView] file: " + file);
     const dir = path.dirname(file);
     const panel = window.createWebviewPanel("webview", "WebView",
-        {
+                                            {
             preserveFocus: true,
             viewColumn,
         },
-        {
+                                            {
             enableScripts: true,
             retainContextWhenHidden: true,
             localResourceRoots: [Uri.file(dir)],
@@ -188,7 +191,7 @@ async function showWebView(file: string, viewColumn: ViewColumn) {
     const content = await fs.readFile(file);
     const html = content.toString()
         .replace("", "
 
 
   
   
-  
-  
-  
+  
+  
+  
   
   
-  
+  
+  
 
 
 `;
@@ -387,11 +393,11 @@ async function updateResponse(sessionStatusBarItem: StatusBarItem) {
     console.info("[updateResponse] Started");
     // Read last line from response file
     const responseLogFile = path.join(workspace.workspaceFolders[0].uri.fsPath,
-        sessionDir, "response.log");
+                                      sessionDir, "response.log");
     console.info("[updateResponse] responseLogFile: " + responseLogFile);
     const content = await fs.readFile(responseLogFile, "utf8");
     const lines = content.split("\n");
-    if (lines.length != responseLineCount) {
+    if (lines.length !== responseLineCount) {
         responseLineCount = lines.length;
         console.info("[updateResponse] lines: " + responseLineCount.toString());
         const lastLine = lines[lines.length - 2];
@@ -414,7 +420,7 @@ async function updateResponse(sessionStatusBarItem: StatusBarItem) {
             showWebView(parseResult.file, ViewColumn[viewColumn]);
         } else if (parseResult.command === "dataview") {
             showDataView(parseResult.source,
-                parseResult.type, parseResult.title, parseResult.file);
+                         parseResult.type, parseResult.title, parseResult.file);
         } else {
             console.error("[updateResponse] Unsupported command: " + parseResult.command);
         }
diff --git a/src/util.ts b/src/util.ts
index b8271291a..cb7607144 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -37,7 +37,7 @@ export function ToRStringLiteral(s: string, quote: string) {
             quote);
 }
 
-export function delay(ms: number) {
+export async function delay(ms: number) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
diff --git a/tslint.json b/tslint.json
index 11afa00a0..06db70dfe 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,5 +1,14 @@
 {
     "extends": [
-        "tslint:recommended"
-    ]
+        "tslint:all"
+    ],
+    "rules": {
+        "no-implicit-dependencies": false,
+        "typedef":false,
+        "completed-docs":false,
+        "only-arrow-functions":false,
+        "object-literal-sort-keys":false,
+        "member-ordering":false,
+        "no-require-imports":false
+    }
 }
\ No newline at end of file

From 875440d7dbca22ca087c7834afc09d8c0d9ead1c Mon Sep 17 00:00:00 2001
From: Andrew 
Date: Wed, 5 Feb 2020 12:44:56 +0900
Subject: [PATCH 132/795] Fix leading slash in tmpDir path

---
 src/preview.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/preview.ts b/src/preview.ts
index fdb1ebc4d..0ded00b10 100644
--- a/src/preview.ts
+++ b/src/preview.ts
@@ -105,7 +105,7 @@ async function waitForFileToFinish(filePath: string) {
 }
 
 function makeTmpDir() {
-    let tmpDir = workspace.workspaceFolders[0].uri.path;
+    let tmpDir = workspace.workspaceFolders[0].uri.fsPath;
     if (process.platform === "win32") {
         tmpDir = tmpDir.replace(/\\/g, "/");
         tmpDir += "/tmp";

From b2d610f339edfba66139b78b5eeffe2aae2dbfe3 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sat, 8 Feb 2020 07:55:23 +0800
Subject: [PATCH 133/795] Update activationEvents

---
 package.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 896e1dcd5..cc60101d0 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,14 @@
   },
   "activationEvents": [
     "onLanguage:r",
-    "workspaceContains:*.r|.rd|.rmd",
+    "onLanguage:rd",
+    "onLanguage:rmd",
+    "workspaceContains:**/*.r",
+    "workspaceContains:**/*.R",
+    "workspaceContains:**/*.rd",
+    "workspaceContains:**/*.Rd",
+    "workspaceContains:**/*.rmd",
+    "workspaceContains:**/*.Rmd",
     "onCommand:r.createRTerm",
     "onCommand:r.runSource",
     "onCommand:r.knitRmd",

From 0524024ce1832c074a0e84210f67e1cedfffb6b9 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sat, 8 Feb 2020 08:28:55 +0800
Subject: [PATCH 134/795] Update activationEvents

---
 package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package.json b/package.json
index cc60101d0..864facb72 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,8 @@
     "onLanguage:r",
     "onLanguage:rd",
     "onLanguage:rmd",
+    "workspaceContains:*.rproj",
+    "workspaceContains:*.Rproj",
     "workspaceContains:**/*.r",
     "workspaceContains:**/*.R",
     "workspaceContains:**/*.rd",

From bc8331f6294c869567d56aa0afacea13664d152d Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sat, 8 Feb 2020 08:35:00 +0800
Subject: [PATCH 135/795] Fix usage of GlobPattern

---
 package.json | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 864facb72..405a5eefc 100644
--- a/package.json
+++ b/package.json
@@ -32,14 +32,7 @@
     "onLanguage:r",
     "onLanguage:rd",
     "onLanguage:rmd",
-    "workspaceContains:*.rproj",
-    "workspaceContains:*.Rproj",
-    "workspaceContains:**/*.r",
-    "workspaceContains:**/*.R",
-    "workspaceContains:**/*.rd",
-    "workspaceContains:**/*.Rd",
-    "workspaceContains:**/*.rmd",
-    "workspaceContains:**/*.Rmd",
+    "workspaceContains:*.{rproj,Rproj,r,R,rd,Rd,rmd,Rmd}",
     "onCommand:r.createRTerm",
     "onCommand:r.runSource",
     "onCommand:r.knitRmd",

From 2ea387a31f038daed19901fcdf2ec75f545a3324 Mon Sep 17 00:00:00 2001
From: Andrew 
Date: Sun, 9 Feb 2020 06:35:24 +0900
Subject: [PATCH 136/795] Add syntax highlighting for R code in Rcpp comment

---
 package.json           |  5 ++++
 syntax/Rcpp.tmLanguage | 67 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 syntax/Rcpp.tmLanguage

diff --git a/package.json b/package.json
index 896e1dcd5..8fa7a5184 100644
--- a/package.json
+++ b/package.json
@@ -112,6 +112,11 @@
         "language": "rmd",
         "scopeName": "text.html.markdown.redcarpet",
         "path": "./syntax/Markdown Redcarpet.tmLanguage"
+      },
+      {
+        "path": "./syntax/Rcpp.tmLanguage",
+        "scopeName": "comment.block.r",
+        "injectTo": ["source.cpp"]
       }
     ],
     "commands": [
diff --git a/syntax/Rcpp.tmLanguage b/syntax/Rcpp.tmLanguage
new file mode 100644
index 000000000..858907d77
--- /dev/null
+++ b/syntax/Rcpp.tmLanguage
@@ -0,0 +1,67 @@
+
+
+
+
+	fileTypes
+	
+	
+	injectionSelector
+	L:source.cpp
+	patterns
+	
+		
+			include
+			#block
+		
+	
+	repository
+	
+		block
+		
+			patterns
+			
+				
+					include
+					#rcpp
+				
+			
+			repository
+			
+				rcpp
+				
+					begin
+					(^|\G)(/[\*]{3}\sR\s*)$
+					captures
+					
+						2
+						
+							name
+							comment.block.cpp
+						
+					
+					end
+					(^|\G)(\*/\s*)($|\z)
+					captures
+					
+						2
+						
+							name
+							comment.block.cpp
+						
+										contentName
+					meta.embedded.block.r
+					patterns
+					
+						
+							include
+							source.r
+						
+					
+				
+			
+		
+	
+	scopeName
+	comment.block.r
+
+

From 1f355a38f00c51e88669001b22c3c2f1eedf6ff8 Mon Sep 17 00:00:00 2001
From: Andrew Craig 
Date: Sun, 9 Feb 2020 13:03:39 +0900
Subject: [PATCH 137/795] Inject R Markdown features into Markdown grammar

---
 package.json                         |   58 +-
 syntax/Markdown Redcarpet.tmLanguage | 1141 +-------------------------
 syntax/RMarkdown.json                |   13 +
 3 files changed, 102 insertions(+), 1110 deletions(-)
 create mode 100644 syntax/RMarkdown.json

diff --git a/package.json b/package.json
index 3e00d80cd..9a2bb8209 100644
--- a/package.json
+++ b/package.json
@@ -81,8 +81,7 @@
         "aliases": [
           "R Markdown",
           "r markdown"
-        ],
-        "configuration": "./rd-configuration.json"
+        ]
       }
     ],
     "snippets": [
@@ -112,8 +111,61 @@
       },
       {
         "language": "rmd",
+        "scopeName": "text.html.rmarkdown",
+        "path": "./syntax/RMarkdown.json",
+        "embeddedLanguages": {
+          "text.html.rmarkdown": "markdown"
+        }
+      },
+      {
         "scopeName": "text.html.markdown.redcarpet",
-        "path": "./syntax/Markdown Redcarpet.tmLanguage"
+        "path": "./syntax/Markdown Redcarpet.tmLanguage",
+        "injectTo": ["text.html.rmarkdown"],
+        "embeddedLanguages": {
+					"meta.embedded.block.html": "html",
+					"source.js": "javascript",
+					"source.css": "css",
+					"meta.embedded.block.frontmatter": "yaml",
+					"meta.embedded.block.css": "css",
+					"meta.embedded.block.ini": "ini",
+					"meta.embedded.block.java": "java",
+					"meta.embedded.block.lua": "lua",
+					"meta.embedded.block.makefile": "makefile",
+					"meta.embedded.block.perl": "perl",
+					"meta.embedded.block.r": "r",
+					"meta.embedded.block.ruby": "ruby",
+					"meta.embedded.block.php": "php",
+					"meta.embedded.block.sql": "sql",
+					"meta.embedded.block.vs_net": "vs_net",
+					"meta.embedded.block.xml": "xml",
+					"meta.embedded.block.xsl": "xsl",
+					"meta.embedded.block.yaml": "yaml",
+					"meta.embedded.block.dosbatch": "dosbatch",
+					"meta.embedded.block.clojure": "clojure",
+					"meta.embedded.block.coffee": "coffee",
+					"meta.embedded.block.c": "c",
+					"meta.embedded.block.cpp": "cpp",
+					"meta.embedded.block.diff": "diff",
+					"meta.embedded.block.dockerfile": "dockerfile",
+					"meta.embedded.block.go": "go",
+					"meta.embedded.block.groovy": "groovy",
+					"meta.embedded.block.pug": "jade",
+					"meta.embedded.block.javascript": "javascript",
+					"meta.embedded.block.json": "json",
+					"meta.embedded.block.less": "less",
+					"meta.embedded.block.objc": "objc",
+					"meta.embedded.block.scss": "scss",
+					"meta.embedded.block.perl6": "perl6",
+					"meta.embedded.block.powershell": "powershell",
+					"meta.embedded.block.python": "python",
+					"meta.embedded.block.rust": "rust",
+					"meta.embedded.block.scala": "scala",
+					"meta.embedded.block.shellscript": "shellscript",
+					"meta.embedded.block.typescript": "typescript",
+					"meta.embedded.block.typescriptreact": "typescriptreact",
+					"meta.embedded.block.csharp": "csharp",
+					"meta.embedded.block.fsharp": "fsharp"
+        }
       },
       {
         "path": "./syntax/Rcpp.tmLanguage",
diff --git a/syntax/Markdown Redcarpet.tmLanguage b/syntax/Markdown Redcarpet.tmLanguage
index a0ea2d317..ef42d8ab8 100644
--- a/syntax/Markdown Redcarpet.tmLanguage	
+++ b/syntax/Markdown Redcarpet.tmLanguage	
@@ -4,23 +4,19 @@
 
 	fileTypes
 	
-		md
-		mdown
-		markdown
-		markdn
-		Rmd
-		rmd
 	
-	keyEquivalent
-	^~M
-	name
-	Markdown Redcarpet
+	injectionSelector
+	L:text.html.rmarkdown
 	patterns
 	
 		
 			include
 			#block
 		
+		
+			include
+			#inline
+		
 	
 	repository
 	
@@ -28,30 +24,6 @@
 		
 			patterns
 			
-				
-					include
-					#yaml_frontmatter
-				
-				
-					include
-					#separator
-				
-				
-					include
-					#heading
-				
-				
-					include
-					#blockquote
-				
-				
-					include
-					#lists
-				
-				
-					include
-					#raw_block
-				
 				
 					include
 					#fenced_block_ruby
@@ -115,39 +87,6 @@
 			
 			repository
 			
-				blockquote
-				
-					begin
-					(^|\G)(>) ?
-					captures
-					
-						2
-						
-							name
-							punctuation.definition.quote.markdown
-						
-					
-					name
-					markup.quote.markdown
-					patterns
-					
-						
-							include
-							#block
-						
-					
-					while
-					(^|\G)(>) ?
-				
-				fenced_block
-				
-					begin
-					(^|\G)([`]{3})[ ]*(\w+)?$
-					end
-					(^|\G)([`]{3})($|\z)
-					name
-					markup.raw.block.markdown.fenced
-				
 				fenced_block_c
 				
 					begin
@@ -155,7 +94,7 @@
 					end
 					(^|\G)([`]{3})($|\z)
 					name
-					markup.raw.block.markdown.fenced
+					meta.embedded.block.c
 					patterns
 					
 						
@@ -171,7 +110,7 @@
 					end
 					(^|\G)([`]{3})($|\z)
 					name
-					markup.raw.block.markdown.fenced
+					meta.embedded.block.coffee
 					patterns
 					
 						
@@ -187,12 +126,12 @@
 					end
 					(^|\G)([`]{3})($|\z)
 					name
-					markup.raw.block.markdown.fenced
+					meta.embedded.block.cpp
 					patterns
 					
 						
 							include
-							source.c++
+							source.cpp
 						
 					
 				
@@ -203,7 +142,7 @@
 					end
 					(^|\G)([`]{3})($|\z)
 					name
-					markup.raw.block.markdown.fenced
+					meta.embedded.block.elixer
 					patterns
 					
 						
@@ -219,7 +158,7 @@
 					end
 					(^|\G)([`]{3})($|\z)
 					name
-					markup.raw.block.markdown.fenced
+					meta.embedded.block.haml
 					patterns
 					
 						
@@ -235,7 +174,7 @@
 					end
 					(^|\G)([`]{3})($|\z)
 					name
-					markup.raw.block.markdown.fenced
+					meta.embedded.block.html
 					patterns
 					
 						
@@ -251,7 +190,7 @@
 					end
 					(^|\G)([`]{3})($|\z)
 					name
-					markup.raw.block.markdown.fenced
+					meta.embedded.block.js
 					patterns
 					
 						
@@ -267,7 +206,7 @@
 					end
 					(^|\G)([`]{3})($|\z)
 					name
-					source.r.embedded.rmarkdown
+					meta.embedded.block.r
 					patterns
 					
 						
@@ -283,7 +222,7 @@
 					end
 					(^|\G)([`]{3})($|\z)
 					name
-					markup.raw.block.markdown.fenced
+					meta.embedded.block.ruby
 					patterns
 					
 						
@@ -299,7 +238,7 @@
 					end
 					(^|\G)([`]{3})($|\z)
 					name
-					markup.raw.block.markdown.fenced
+					meta.embedded.block.shell
 					patterns
 					
 						
@@ -315,7 +254,7 @@
 					end
 					(^|\G)([`]{3})($|\z)
 					name
-					markup.raw.block.markdown.fenced
+					meta.embedded.block.yaml
 					patterns
 					
 						
@@ -324,1063 +263,51 @@
 						
 					
 				
-				heading
-				
-					begin
-					(?:^|\G)(#{1,6})\s*(?=[\S[^#]])
-					captures
-					
-						1
-						
-							name
-							punctuation.definition.heading.markdown
-						
-					
-					contentName
-					entity.name.section.markdown
-					end
-					\s*(#{1,6})?$\n?
-					name
-					markup.heading.${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.markdown
-					patterns
-					
-						
-							include
-							#inline
-						
-					
-				
-				heading-setext
-				
-					patterns
-					
-						
-							match
-							^(={3,})(?=[ \t]*$\n?)
-							name
-							markup.heading.setext.1.markdown
-						
-						
-							match
-							^(-{3,})(?=[ \t]*$\n?)
-							name
-							markup.heading.setext.2.markdown
-						
-					
-				
-				html
-				
-					patterns
-					
-						
-							begin
-							(?i)(^|\G)(?=<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del).*</\2\s*>\s*$)
-							end
-							$
-							patterns
-							
-								
-									include
-									text.html.basic
-								
-							
-						
-						
-							begin
-							(?i)(^|\G)(?=<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del))
-							patterns
-							
-								
-									include
-									text.html.basic
-								
-							
-							while
-							\G(?!</\2\s*>)
-						
-					
-				
-				link-def
-				
-					captures
-					
-						1
-						
-							name
-							punctuation.definition.constant.markdown
-						
-						10
-						
-							name
-							punctuation.definition.string.end.markdown
-						
-						11
-						
-							name
-							string.other.link.description.title.markdown
-						
-						12
-						
-							name
-							punctuation.definition.string.begin.markdown
-						
-						13
-						
-							name
-							punctuation.definition.string.end.markdown
-						
-						2
-						
-							name
-							constant.other.reference.link.markdown
-						
-						3
-						
-							name
-							punctuation.definition.constant.markdown
-						
-						4
-						
-							name
-							punctuation.separator.key-value.markdown
-						
-						5
-						
-							name
-							punctuation.definition.link.markdown
-						
-						6
-						
-							name
-							markup.underline.link.markdown
-						
-						7
-						
-							name
-							punctuation.definition.link.markdown
-						
-						8
-						
-							name
-							string.other.link.description.title.markdown
-						
-						9
-						
-							name
-							punctuation.definition.string.begin.markdown
-						
-					
-					match
-					^(?x:
-									\s*						# Leading whitespace
-									(\[)(.+?)(\])(:)		# Reference name
-									[ \t]*					# Optional whitespace
-									(<?)(\S+?)(>?)			# The url
-									[ \t]*					# Optional whitespace
-									(?:
-										  ((\().+?(\)))		# Match title in quotes…
-										| ((").+?("))		# or in parens.
-									)?						# Title is optional
-									\s*						# Optional whitespace
-									$
-								)
-					name
-					meta.link.reference.def.markdown
-				
-				list_paragraph
-				
-					begin
-					(^|\G)(?=\S)(?![*+-]\s|[0-9]+\.\s)
-					name
-					meta.paragraph.markdown
-					patterns
-					
-						
-							include
-							#inline
-						
-						
-							include
-							text.html.basic
-						
-						
-							include
-							#heading-setext
-						
-					
-					while
-					(^|\G)(?!\s*$|#|[ ]{,3}([-*_][ ]{2,}){3,}[ \t]*$\n?|>|[ ]{0,3}[*+-]|[ ]{0,3}[0-9]+\.)
-				
-				lists
-				
-					patterns
-					
-						
-							begin
-							(^|\G)([ ]{0,3})([*+-])([ ]{1,3}|\t)
-							beginCaptures
-							
-								3
-								
-									name
-									punctuation.definition.list.markdown
-								
-							
-							comment
-							Currently does not support un-indented second lines.
-							name
-							markup.list.unnumbered.markdown
-							patterns
-							
-								
-									include
-									#list_paragraph
-								
-								
-									include
-									#block
-								
-							
-							while
-							\G([ ]{4}|\t|$)
-						
-						
-							begin
-							(^|\G)([ ]{0,3})([0-9]+\.)([ ]{1,3}|\t)
-							beginCaptures
-							
-								3
-								
-									name
-									punctuation.definition.list.markdown
-								
-							
-							name
-							markup.list.numbered.markdown
-							patterns
-							
-								
-									include
-									#list_paragraph
-								
-								
-									include
-									#block
-								
-							
-							while
-							\G([ ]{4}|\t|$)
-						
-					
-				
-				paragraph
-				
-					begin
-					(^|\G)(?=\S)
-					name
-					meta.paragraph.markdown
-					patterns
-					
-						
-							include
-							#inline
-						
-						
-							include
-							text.html.basic
-						
-						
-							include
-							#heading-setext
-						
-					
-					while
-					(^|\G)(?!\s*$|#|[ ]{,3}([-*_][ ]{2,}){3,}[ \t]*$\n?|\s*\[.+?\]:|>)
-				
-				raw_block
-				
-					begin
-					(^|\G)([ ]{4}|\t)
-					name
-					markup.raw.block.markdown
-					while
-					(^|\G)([ ]{4}|\t)
-				
-				separator
-				
-					match
-					(^|\G)[ ]{,3}([-*_])([ ]{,2}\2){2,}[ \t]*$\n?
-					name
-					meta.separator.markdown
-				
-				yaml_frontmatter
-				
-					begin
-					(^|\G)[ ]{,3}([-*_])([ ]{,2}\2){2,}[ \t]*$\n?
-					end
-					(^|\G)[ ]{,3}([-*_])([ ]{,2}\2){2,}[ \t]*$\n?
-					name
-					meta.frontmatter.markdown
-				
 			
 		
 		inline
 		
 			patterns
 			
-				
-					include
-					#ampersand
-				
-				
-					include
-					#bracket
-				
-				
-					include
-					#bold
-				
-				
-					include
-					#italic
-				
 				
 					include
 					#code-inline-r
 				
-				
-					include
-					#raw
-				
-				
-					include
-					#escape
-				
-				
-					include
-					#image-inline
-				
-				
-					include
-					#image-ref
-				
-				
-					include
-					#link-email
-				
-				
-					include
-					#link-inet
-				
-				
-					include
-					#link-inline
-				
-				
-					include
-					#link-ref
-				
-				
-					include
-					#link-ref-literal
-				
 			
 			repository
 			
-				ampersand
-				
-					comment
-					
-						Markdown will convert this for us. We match it so that the
-						HTML grammar will not mark it up as invalid.
-					
-					match
-					&(?!([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+);)
-					name
-					meta.other.valid-ampersand.markdown
-				
-				bold
+				code-inline-r
 				
 					begin
-					(?x)
-								(\*\*|__)(?=\S)								# Open
-								(?=
-									(
-									    <[^>]*+>							# HTML tags
-									  | (?<raw>`+)([^`]|(?!(?<!`)\k<raw>(?!`))`)*+\k<raw>
-																			# Raw
-									  | \\[\\`*_{}\[\]()#.!+\->]?+			# Escapes
-									  | \[
-										(
-										        (?<square>					# Named group
-													[^\[\]\\]				# Match most chars
-										          | \\.						# Escaped chars
-										          | \[ \g<square>*+ \]		# Nested brackets
-										        )*+
-											\]
-											(
-												(							# Reference Link
-													[ ]?					# Optional space
-													\[[^\]]*+\]				# Ref name
-												)
-											  | (							# Inline Link
-													\(						# Opening paren
-														[ \t]*+				# Optional whtiespace
-														<?(.*?)>?			# URL
-														[ \t]*+				# Optional whtiespace
-														(					# Optional Title
-															(?<title>['"])
-															(.*?)
-															\k<title>
-														)?
-													\)
-												)
-											)
-										)
-									  | (?!(?<=\S)\1).						# Everything besides
-																			# style closer
-									)++
-									(?<=\S)\1								# Close
-								)
-							
-					captures
+					(`[r|R][ ]+)
+					beginCaptures
 					
 						1
 						
 							name
-							punctuation.definition.bold.markdown
+							punctuation.definition.raw.rmarkdown
 						
 					
 					end
-					(?<=\S)(\1)
-					name
-					markup.bold.markdown
-					patterns
-					
-						
-							applyEndPatternLast
-							1
-							begin
-							(?=<[^>]*?>)
-							end
-							(?<=>)
-							patterns
-							
-								
-									include
-									text.html.basic
-								
-							
-						
-						
-							include
-							#escape
-						
-						
-							include
-							#ampersand
-						
-						
-							include
-							#bracket
-						
-						
-							include
-							#raw
-						
+					(`)
+					endCaptures
+					
+						1
 						
-							include
-							#italic
+							name
+							punctuation.definition.raw.rmarkdown
 						
+					
+					contentName
+					meta.embedded.block.r
+					patterns
+					
 						
 							include
-							#image-inline
-						
-						
-							include
-							#link-inline
-						
-						
-							include
-							#link-inet
-						
-						
-							include
-							#link-email
-						
-						
-							include
-							#image-ref
-						
-						
-							include
-							#link-ref-literal
-						
-						
-							include
-							#link-ref
-						
-					
-				
-				bracket
-				
-					comment
-					
-						Markdown will convert this for us. We match it so that the
-						HTML grammar will not mark it up as invalid.
-					
-					match
-					<(?![a-z/?\$!])
-					name
-					meta.other.valid-bracket.markdown
-				
-				code-inline-r
-				
-					begin
-					(`[r|R][ ]+)
-					beginCaptures
-					
-						1
-						
-							name
-							punctuation.definition.raw.markdown
-						
-					
-					end
-					(`)
-					endCaptures
-					
-						1
-						
-							name
-							punctuation.definition.raw.markdown
-						
-					
-					name
-					source.r.embedded.rmarkdown
-					patterns
-					
-						
-							include
-							source.r
+							source.r
 						
 					
 				
-				escape
-				
-					match
-					\\[-`*_#+.!(){}\[\]\\>]
-					name
-					constant.character.escape.markdown
-				
-				image-inline
-				
-					captures
-					
-						1
-						
-							name
-							punctuation.definition.string.begin.markdown
-						
-						10
-						
-							name
-							string.other.link.description.title.markdown
-						
-						11
-						
-							name
-							punctuation.definition.string.markdown
-						
-						12
-						
-							name
-							punctuation.definition.string.markdown
-						
-						13
-						
-							name
-							string.other.link.description.title.markdown
-						
-						14
-						
-							name
-							punctuation.definition.string.markdown
-						
-						15
-						
-							name
-							punctuation.definition.string.markdown
-						
-						16
-						
-							name
-							punctuation.definition.metadata.markdown
-						
-						2
-						
-							name
-							string.other.link.description.markdown
-						
-						4
-						
-							name
-							punctuation.definition.string.end.markdown
-						
-						5
-						
-							name
-							invalid.illegal.whitespace.markdown
-						
-						6
-						
-							name
-							punctuation.definition.metadata.markdown
-						
-						7
-						
-							name
-							punctuation.definition.link.markdown
-						
-						8
-						
-							name
-							markup.underline.link.image.markdown
-						
-						9
-						
-							name
-							punctuation.definition.link.markdown
-						
-					
-					match
-					(?x:
-						\!							# Images start with !
-						(\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\])
-													# Match the link text.
-						([ ])?						# Space not allowed
-						(\()						# Opening paren for url
-							(<?)(\S+?)(>?)			# The url
-							[ \t]*					# Optional whitespace
-							(?:
-								  ((\().+?(\)))		# Match title in parens…
-								| ((").+?("))		# or in quotes.
-							)?						# Title is optional
-							\s*						# Optional whitespace
-						(\))
-					 )
-					name
-					meta.image.inline.markdown
-				
-				image-ref
-				
-					captures
-					
-						1
-						
-							name
-							punctuation.definition.string.begin.markdown
-						
-						2
-						
-							name
-							string.other.link.description.markdown
-						
-						4
-						
-							name
-							punctuation.definition.string.begin.markdown
-						
-						5
-						
-							name
-							punctuation.definition.constant.markdown
-						
-						6
-						
-							name
-							constant.other.reference.link.markdown
-						
-						7
-						
-							name
-							punctuation.definition.constant.markdown
-						
-					
-					match
-					\!(\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\])[ ]?(\[)(.*?)(\])
-					name
-					meta.image.reference.markdown
-				
-				italic
-				
-					begin
-					(?x)
-								(\*|_)(?=\S)								# Open
-								(?=
-									(
-									    <[^>]*+>							# HTML tags
-									  | (?<raw>`+)([^`]|(?!(?<!`)\k<raw>(?!`))`)*+\k<raw>
-																			# Raw
-									  | \\[\\`*_{}\[\]()#.!+\->]?+			# Escapes
-									  | \[
-										(
-										        (?<square>					# Named group
-													[^\[\]\\]				# Match most chars
-										          | \\.						# Escaped chars
-										          | \[ \g<square>*+ \]		# Nested brackets
-										        )*+
-											\]
-											(
-												(							# Reference Link
-													[ ]?					# Optional space
-													\[[^\]]*+\]				# Ref name
-												)
-											  | (							# Inline Link
-													\(						# Opening paren
-														[ \t]*+				# Optional whtiespace
-														<?(.*?)>?			# URL
-														[ \t]*+				# Optional whtiespace
-														(					# Optional Title
-															(?<title>['"])
-															(.*?)
-															\k<title>
-														)?
-													\)
-												)
-											)
-										)
-									  | \1\1								# Must be bold closer
-									  | (?!(?<=\S)\1).						# Everything besides
-																			# style closer
-									)++
-									(?<=\S)\1								# Close
-								)
-							
-					captures
-					
-						1
-						
-							name
-							punctuation.definition.italic.markdown
-						
-					
-					end
-					(?<=\S)(\1)((?!\1)|(?=\1\1))
-					name
-					markup.italic.markdown
-					patterns
-					
-						
-							applyEndPatternLast
-							1
-							begin
-							(?=<[^>]*?>)
-							end
-							(?<=>)
-							patterns
-							
-								
-									include
-									text.html.basic
-								
-							
-						
-						
-							include
-							#escape
-						
-						
-							include
-							#ampersand
-						
-						
-							include
-							#bracket
-						
-						
-							include
-							#raw
-						
-						
-							include
-							#bold
-						
-						
-							include
-							#image-inline
-						
-						
-							include
-							#link-inline
-						
-						
-							include
-							#link-inet
-						
-						
-							include
-							#link-email
-						
-						
-							include
-							#image-ref
-						
-						
-							include
-							#link-ref-literal
-						
-						
-							include
-							#link-ref
-						
-					
-				
-				link-email
-				
-					captures
-					
-						1
-						
-							name
-							punctuation.definition.link.markdown
-						
-						2
-						
-							name
-							markup.underline.link.markdown
-						
-						4
-						
-							name
-							punctuation.definition.link.markdown
-						
-					
-					match
-					(<)((?:mailto:)?[-.\w]+@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)(>)
-					name
-					meta.link.email.lt-gt.markdown
-				
-				link-inet
-				
-					captures
-					
-						1
-						
-							name
-							punctuation.definition.link.markdown
-						
-						2
-						
-							name
-							markup.underline.link.markdown
-						
-						3
-						
-							name
-							punctuation.definition.link.markdown
-						
-					
-					match
-					(<)((?:https?|ftp)://.*?)(>)
-					name
-					meta.link.inet.markdown
-				
-				link-inline
-				
-					captures
-					
-						1
-						
-							name
-							punctuation.definition.string.begin.markdown
-						
-						10
-						
-							name
-							string.other.link.description.title.markdown
-						
-						11
-						
-							name
-							punctuation.definition.string.begin.markdown
-						
-						12
-						
-							name
-							punctuation.definition.string.end.markdown
-						
-						13
-						
-							name
-							string.other.link.description.title.markdown
-						
-						14
-						
-							name
-							punctuation.definition.string.begin.markdown
-						
-						15
-						
-							name
-							punctuation.definition.string.end.markdown
-						
-						16
-						
-							name
-							punctuation.definition.metadata.markdown
-						
-						2
-						
-							name
-							string.other.link.title.markdown
-						
-						4
-						
-							name
-							punctuation.definition.string.end.markdown
-						
-						5
-						
-							name
-							invalid.illegal.whitespace.markdown
-						
-						6
-						
-							name
-							punctuation.definition.metadata.markdown
-						
-						7
-						
-							name
-							punctuation.definition.link.markdown
-						
-						8
-						
-							name
-							markup.underline.link.markdown
-						
-						9
-						
-							name
-							punctuation.definition.link.markdown
-						
-					
-					match
-					(?x:
-						(\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\])
-													# Match the link text.
-						([ ])?						# Space not allowed
-						(\()						# Opening paren for url
-							(<?)(.*?)(>?)			# The url
-							[ \t]*					# Optional whitespace
-							(?:
-								  ((\().+?(\)))		# Match title in parens…
-								| ((").+?("))		# or in quotes.
-							)?						# Title is optional
-							\s*						# Optional whitespace
-						(\))
-					 )
-					name
-					meta.link.inline.markdown
-				
-				link-ref
-				
-					captures
-					
-						1
-						
-							name
-							punctuation.definition.string.begin.markdown
-						
-						2
-						
-							name
-							string.other.link.title.markdown
-						
-						4
-						
-							name
-							punctuation.definition.string.end.markdown
-						
-						5
-						
-							name
-							punctuation.definition.constant.begin.markdown
-						
-						6
-						
-							name
-							constant.other.reference.link.markdown
-						
-						7
-						
-							name
-							punctuation.definition.constant.end.markdown
-						
-					
-					match
-					(\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\])[ ]?(\[)([^\]]*+)(\])
-					name
-					meta.link.reference.markdown
-				
-				link-ref-literal
-				
-					captures
-					
-						1
-						
-							name
-							punctuation.definition.string.begin.markdown
-						
-						2
-						
-							name
-							string.other.link.title.markdown
-						
-						4
-						
-							name
-							punctuation.definition.string.end.markdown
-						
-						5
-						
-							name
-							punctuation.definition.constant.begin.markdown
-						
-						6
-						
-							name
-							punctuation.definition.constant.end.markdown
-						
-					
-					match
-					(\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\])[ ]?(\[)(\])
-					name
-					meta.link.reference.literal.markdown
-				
-				raw
-				
-					captures
-					
-						1
-						
-							name
-							punctuation.definition.raw.markdown
-						
-						2
-						
-						3
-						
-							name
-							punctuation.definition.raw.markdown
-						
-					
-					match
-					(`+(?!([r|R][ ]+)))([^`]|(?!(?<!`)\1(?!`))`)*+(\1)
-					name
-					markup.raw.inline.markdown
-				
 			
 		
 	
diff --git a/syntax/RMarkdown.json b/syntax/RMarkdown.json
new file mode 100644
index 000000000..f322648f2
--- /dev/null
+++ b/syntax/RMarkdown.json
@@ -0,0 +1,13 @@
+{
+    "name": "R Markdown",
+    "scopeName": "text.html.rmarkdown",
+    "fileTypes": [
+        "Rmd",
+        "rmd"
+    ],
+    "patterns": [
+        {
+            "include": "text.html.markdown"
+        }
+    ]
+}

From 5a8b8617d7ec0b1287afbebf08d44640554d1c28 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 11 Feb 2020 20:42:19 +0800
Subject: [PATCH 138/795] Add statement of languageserver features to
 bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 9b2fd8201..6ac60b5a4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,6 +7,12 @@ assignees: ''
 
 ---
 
+
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
@@ -62,9 +68,10 @@ If applicable, add screenshots to help explain your problem.
 You can show the keybord contents by pressing `F1` and `Developer: toggle screencast mode`
 
 **Environment (please complete the following information):**
- - OS: [e.g. iOS]
- - VSCode Version [e.g. 22]
- - R Version
+ - OS: [e.g. Windows, macOS, Linux]
+ - VSCode Version: [e.g. 1.42.0]
+ - R Version: [e.g. 3.6.2]
+ - vscode-R version: [e.g. 1.2.2]
 
 **Additional context**
 Add any other context about the problem here.

From 7f237cbcc09c3d8d82e1e850105514fb09e4a6c5 Mon Sep 17 00:00:00 2001
From: stanmart 
Date: Wed, 12 Feb 2020 15:27:59 +0100
Subject: [PATCH 139/795] Fixed the function snippet (Issue #230)

Added the missing opening bracket and fixed the description of the function snippet.
---
 snippets/r-snippets.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/r-snippets.json b/snippets/r-snippets.json
index 79b3db6f4..744402889 100644
--- a/snippets/r-snippets.json
+++ b/snippets/r-snippets.json
@@ -369,11 +369,11 @@
     "function": {
         "prefix": "function",
         "body": [
-            "${1:name} <- function(${2:parameters})",
+            "${1:name} <- function(${2:parameters}) {",
             "   ${3:selected}",
             "}"
         ],
-        "description": "Code snippet for 'if' conditional"       
+        "description": "Named function"       
     },
     "if": {
         "prefix": "if",
@@ -409,4 +409,4 @@
 		],
 		"description": "Folding Region End"
 	}
-}
\ No newline at end of file
+}

From 95b84de39b29c5ce36e46d7c4b36af34fac521e7 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Thu, 13 Feb 2020 23:46:01 +0900
Subject: [PATCH 140/795] add collaborator

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0916532ad..396a29a8a 100644
--- a/README.md
+++ b/README.md
@@ -162,6 +162,7 @@ I hope you will join us.
 
 * [@andycraig](https://github.com/andycraig)
 * [@Ladvien](https://github.com/Ladvien)
+* [@renkun-ken](https://github.com/renkun-ken)
 
 ## FAQ
 

From 75fb05bfae702ee8bd16c19446f341a7e379ef57 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Thu, 13 Feb 2020 23:46:12 +0900
Subject: [PATCH 141/795] version 1.2.3

---
 CHANGELOG.md      |    7 +
 package-lock.json | 2871 +++++++++++++++++++++++----------------------
 package.json      |   22 +-
 3 files changed, 1456 insertions(+), 1444 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8be55ffa9..04f16159d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 1.2.3
+* Fixed the function snippet (Fixed #230) (Thank you @stanmart)
+* Update activationEvents
+* Add more logging to session watcher
+* Avoid duplicate handling of response update
+* Add syntax highlighting for R code in Rcpp comment #225
+
 ## 1.2.2
 
 * View improvement (Thank you @renkun-ken)
diff --git a/package-lock.json b/package-lock.json
index d88773c24..ce9f8ad84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "r",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -34,21 +34,21 @@
       }
     },
     "@types/mocha": {
-      "version": "5.2.7",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz",
-      "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.1.tgz",
+      "integrity": "sha512-L/Nw/2e5KUaprNJoRA33oly+M8X8n0K+FwLTbYqwTcR14wdPWeRkigBLfSFpN/Asf9ENZTMZwLxjtjeYucAA4Q==",
       "dev": true
     },
     "@types/node": {
-      "version": "12.7.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.8.tgz",
-      "integrity": "sha512-FMdVn84tJJdV+xe+53sYiZS4R5yn1mAIxfj+DVoNiQjTYz1+OYmjwEZr1ev9nU0axXwda0QDbYl06QHanRVH3A==",
+      "version": "13.7.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz",
+      "integrity": "sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==",
       "dev": true
     },
     "@types/vscode": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.40.0.tgz",
-      "integrity": "sha512-5kEIxL3qVRkwhlMerxO7XuMffa+0LBl+iG2TcRa0NsdoeSFLkt/9hJ02jsi/Kvc6y8OVF2N2P2IHP5S4lWf/5w==",
+      "version": "1.42.0",
+      "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.42.0.tgz",
+      "integrity": "sha512-ds6TceMsh77Fs0Mq0Vap6Y72JbGWB8Bay4DrnJlf5d9ui2RSe1wis13oQm+XhguOeH1HUfLGzaDAoupTUtgabw==",
       "dev": true
     },
     "@webassemblyjs/ast": {
@@ -300,127 +300,13 @@
       }
     },
     "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
       "dev": true,
       "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
       }
     },
     "aproba": {
@@ -590,11 +476,21 @@
       "dev": true
     },
     "binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
       "dev": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -906,90 +802,28 @@
       }
     },
     "chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "fsevents": "^1.2.7",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
+      "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.1.1",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.2.0"
       },
       "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+        "glob-parent": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
+          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "is-glob": "^4.0.1"
           }
         }
       }
@@ -1646,13 +1480,13 @@
       }
     },
     "enhanced-resolve": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
-      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
+      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
+        "memory-fs": "^0.5.0",
         "tapable": "^1.0.0"
       }
     },
@@ -1675,27 +1509,28 @@
       }
     },
     "es-abstract": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz",
-      "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==",
+      "version": "1.17.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
+      "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "^1.2.0",
+        "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.0",
-        "is-callable": "^1.1.4",
-        "is-regex": "^1.0.4",
-        "object-inspect": "^1.6.0",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.1.5",
+        "is-regex": "^1.0.5",
+        "object-inspect": "^1.7.0",
         "object-keys": "^1.1.1",
-        "string.prototype.trimleft": "^2.1.0",
-        "string.prototype.trimright": "^2.1.0"
+        "object.assign": "^4.1.0",
+        "string.prototype.trimleft": "^2.1.1",
+        "string.prototype.trimright": "^2.1.1"
       }
     },
     "es-to-primitive": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
-      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
       "requires": {
         "is-callable": "^1.1.4",
@@ -1747,9 +1582,9 @@
       "dev": true
     },
     "events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
+      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
       "dev": true
     },
     "evp_bytestokey": {
@@ -1940,6 +1775,13 @@
       "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
       "dev": true
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -2057,6 +1899,12 @@
             }
           }
         },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -2117,14 +1965,6 @@
       "dev": true,
       "requires": {
         "is-buffer": "~2.0.3"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
-          "dev": true
-        }
       }
     },
     "flush-write-stream": {
@@ -2270,816 +2110,272 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.10.tgz",
-      "integrity": "sha512-Dw5DScF/8AWhWzWRbnQrFJfeR/TOJZjRr9Du9kfmd8t234ICcVeDBlauFl/jVcE5ZewhlPoCFvIqp0SE3kAVxA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+      "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+      "dev": true,
+      "optional": true
+    },
+    "fswin": {
+      "version": "3.18.918",
+      "resolved": "https://registry.npmjs.org/fswin/-/fswin-3.18.918.tgz",
+      "integrity": "sha512-9dwdStHWoL25DJiQ4jG/No9vBeKB+BVTLDuvXfNtVP5jf4j9zpBnje8gb5xpAqXN59wV7n8RSdDaGhhVzf7/ZA=="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "nan": "^2.12.1",
-        "node-pre-gyp": "^0.12.0"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "debug": {
-          "version": "3.2.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "deep-extend": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "fs-minipass": {
-          "version": "1.2.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.6.0"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
+            "is-extglob": "^2.1.0"
           }
-        },
-        "glob": {
-          "version": "7.1.6",
-          "bundled": true,
+        }
+      }
+    },
+    "glob-parse": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/glob-parse/-/glob-parse-0.0.1.tgz",
+      "integrity": "sha1-N9Ml6xVTvpwfQnJzinVWZEWGbdY=",
+      "dev": true
+    },
+    "global-dirs": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.4"
+      }
+    },
+    "global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^3.0.0"
+      },
+      "dependencies": {
+        "global-prefix": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+          "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "ini": "^1.3.5",
+            "kind-of": "^6.0.2",
+            "which": "^1.3.1"
           }
         },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "bundled": true,
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "isexe": "^2.0.0"
           }
+        }
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
+    "globby": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "dir-glob": "^2.0.0",
+        "glob": "^7.1.2",
+        "ignore": "^3.3.5",
+        "pify": "^3.0.0",
+        "slash": "^1.0.0"
+      }
+    },
+    "got": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+      "dev": true,
+      "requires": {
+        "create-error-class": "^3.0.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "is-redirect": "^1.0.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "lowercase-keys": "^1.0.0",
+        "safe-buffer": "^5.0.1",
+        "timed-out": "^4.0.0",
+        "unzip-response": "^2.0.1",
+        "url-parse-lax": "^1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+    },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "dev": true
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
         },
-        "ignore-walk": {
-          "version": "3.0.3",
-          "bundled": true,
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "minimatch": "^3.0.4"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
+            "is-buffer": "^1.1.5"
           }
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.9.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.3.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.9.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "^3.2.6",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.12.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        },
-        "npm-normalize-package-bin": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.4.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.13",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.8.6",
-            "minizlib": "^1.2.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.3"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "^1.0.2 || 2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
         }
       }
     },
-    "fswin": {
-      "version": "3.18.918",
-      "resolved": "https://registry.npmjs.org/fswin/-/fswin-3.18.918.tgz",
-      "integrity": "sha512-9dwdStHWoL25DJiQ4jG/No9vBeKB+BVTLDuvXfNtVP5jf4j9zpBnje8gb5xpAqXN59wV7n8RSdDaGhhVzf7/ZA=="
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "dev": true,
       "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
-    "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "glob-parse": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/glob-parse/-/glob-parse-0.0.1.tgz",
-      "integrity": "sha1-N9Ml6xVTvpwfQnJzinVWZEWGbdY=",
-      "dev": true
-    },
-    "global-dirs": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-      "dev": true,
-      "requires": {
-        "ini": "^1.3.4"
-      }
-    },
-    "global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "requires": {
-        "global-prefix": "^3.0.0"
-      },
-      "dependencies": {
-        "global-prefix": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-          "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-          "dev": true,
-          "requires": {
-            "ini": "^1.3.5",
-            "kind-of": "^6.0.2",
-            "which": "^1.3.1"
-          }
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      }
-    },
-    "globby": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-      "dev": true,
-      "requires": {
-        "array-union": "^1.0.1",
-        "dir-glob": "^2.0.0",
-        "glob": "^7.1.2",
-        "ignore": "^3.3.5",
-        "pify": "^3.0.0",
-        "slash": "^1.0.0"
-      }
-    },
-    "got": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-      "dev": true,
-      "requires": {
-        "create-error-class": "^3.0.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "is-redirect": "^1.0.0",
-        "is-retry-allowed": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "lowercase-keys": "^1.0.0",
-        "safe-buffer": "^5.0.1",
-        "timed-out": "^4.0.0",
-        "unzip-response": "^2.0.1",
-        "url-parse-lax": "^1.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.1.15",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
-    },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "has-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
-      "dev": true
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
@@ -3207,6 +2503,12 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -3225,24 +2527,24 @@
       "dev": true
     },
     "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
       "requires": {
-        "binary-extensions": "^1.0.0"
+        "binary-extensions": "^2.0.0"
       }
     },
     "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
       "dev": true
     },
     "is-callable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
       "dev": true
     },
     "is-ci": {
@@ -3263,6 +2565,12 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -3275,9 +2583,9 @@
       }
     },
     "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
       "dev": true
     },
     "is-descriptor": {
@@ -3379,12 +2687,12 @@
       "dev": true
     },
     "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
       "dev": true,
       "requires": {
-        "has": "^1.0.1"
+        "has": "^1.0.3"
       }
     },
     "is-retry-allowed": {
@@ -3400,12 +2708,12 @@
       "dev": true
     },
     "is-symbol": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
-      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
       "dev": true,
       "requires": {
-        "has-symbols": "^1.0.0"
+        "has-symbols": "^1.0.1"
       }
     },
     "is-windows": {
@@ -3494,9 +2802,9 @@
       }
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "latest-version": {
@@ -3637,9 +2945,9 @@
       }
     },
     "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
       "dev": true,
       "requires": {
         "errno": "^0.1.3",
@@ -3653,9 +2961,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -3852,13 +3160,14 @@
       "dev": true
     },
     "mocha": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.2.tgz",
-      "integrity": "sha512-FgDS9Re79yU1xz5d+C4rv1G7QagNGHZ+iXF81hO8zY35YZZcLEsJVfFolfsqKFWunATEvNzMK0r/CwWd/szO9A==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.0.1.tgz",
+      "integrity": "sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==",
       "dev": true,
       "requires": {
         "ansi-colors": "3.2.3",
         "browser-stdout": "1.3.1",
+        "chokidar": "3.3.0",
         "debug": "3.2.6",
         "diff": "3.5.0",
         "escape-string-regexp": "1.0.5",
@@ -3871,7 +3180,7 @@
         "minimatch": "3.0.4",
         "mkdirp": "0.5.1",
         "ms": "2.1.1",
-        "node-environment-flags": "1.0.5",
+        "node-environment-flags": "1.0.6",
         "object.assign": "4.1.0",
         "strip-json-comments": "2.0.1",
         "supports-color": "6.0.0",
@@ -4050,9 +3359,9 @@
       }
     },
     "node-environment-flags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
-      "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
+      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
       "dev": true,
       "requires": {
         "object.getownpropertydescriptors": "^2.0.3",
@@ -4111,9 +3420,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -4205,6 +3514,12 @@
             "is-descriptor": "^0.1.0"
           }
         },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -4217,9 +3532,9 @@
       }
     },
     "object-inspect": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
-      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
       "dev": true
     },
     "object-keys": {
@@ -4250,13 +3565,13 @@
       }
     },
     "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
       }
     },
     "object.pick": {
@@ -4352,9 +3667,9 @@
       "dev": true
     },
     "p-is-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
-      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
       "dev": true
     },
     "p-limit": {
@@ -4394,9 +3709,9 @@
       }
     },
     "pako": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
       "dev": true
     },
     "parallel-transform": {
@@ -4551,9 +3866,9 @@
       }
     },
     "picomatch": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz",
-      "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz",
+      "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==",
       "dev": true
     },
     "pify": {
@@ -4583,9 +3898,9 @@
       }
     },
     "popper.js": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.0.tgz",
-      "integrity": "sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw=="
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     },
     "posix-character-classes": {
       "version": "0.1.1",
@@ -4745,149 +4060,12 @@
       }
     },
     "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
+      "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
+        "picomatch": "^2.0.4"
       }
     },
     "regex-not": {
@@ -5272,6 +4450,12 @@
         "kind-of": "^3.2.0"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -5296,12 +4480,12 @@
       "dev": true
     },
     "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "dev": true,
       "requires": {
-        "atob": "^2.1.1",
+        "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
         "source-map-url": "^0.4.0",
@@ -5394,9 +4578,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -5449,9 +4633,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -5491,9 +4675,9 @@
       }
     },
     "string.prototype.trimleft": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
-      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
+      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
@@ -5501,9 +4685,9 @@
       }
     },
     "string.prototype.trimright": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
-      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
+      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
@@ -5562,9 +4746,9 @@
       }
     },
     "terser": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.2.tgz",
-      "integrity": "sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ==",
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz",
+      "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -5651,6 +4835,12 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -5684,9 +4874,9 @@
       }
     },
     "ts-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.0.tgz",
-      "integrity": "sha512-Da8h3fD+HiZ9GvZJydqzk3mTC9nuOKYlJcpuk+Zv6Y1DPaMvBL+56GRzZFypx2cWrZFMsQr869+Ua2slGoLxvQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.1.tgz",
+      "integrity": "sha512-Dd9FekWuABGgjE1g0TlQJ+4dFUfYGbYcs52/HQObE0ZmUNjQlmLAS7xXsSzy23AMaMwipsx5sNHvoEpT2CZq1g==",
       "dev": true,
       "requires": {
         "chalk": "^2.3.0",
@@ -5832,150 +5022,916 @@
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
           "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        }
+      }
+    },
+    "unzip-response": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+      "dev": true
+    },
+    "upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^1.0.1"
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "requires": {
+        "inherits": "2.0.1"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
+      "dev": true
+    },
+    "v8-compile-cache": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
+      "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==",
+      "dev": true
+    },
+    "vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fsevents": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
+          "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1",
+            "node-pre-gyp": "*"
+          },
+          "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
+              }
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "chownr": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "core-util-is": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "debug": {
+              "version": "3.2.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            },
+            "deep-extend": {
+              "version": "0.6.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.7",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.6.0"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
+              }
+            },
+            "glob": {
+              "version": "7.1.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.24",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+              }
+            },
+            "ignore-walk": {
+              "version": "3.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimatch": "^3.0.4"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+              }
+            },
+            "inherits": {
+              "version": "2.0.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "minizlib": {
+              "version": "1.3.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.9.0"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "needle": {
+              "version": "2.4.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "debug": "^3.2.6",
+                "iconv-lite": "^0.4.4",
+                "sax": "^1.2.4"
+              }
+            },
+            "node-pre-gyp": {
+              "version": "0.14.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "detect-libc": "^1.0.2",
+                "mkdirp": "^0.5.1",
+                "needle": "^2.2.1",
+                "nopt": "^4.0.1",
+                "npm-packlist": "^1.1.6",
+                "npmlog": "^4.0.2",
+                "rc": "^1.2.7",
+                "rimraf": "^2.6.1",
+                "semver": "^5.3.0",
+                "tar": "^4.4.2"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1",
+                "osenv": "^0.1.4"
+              }
+            },
+            "npm-bundled": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "npm-normalize-package-bin": "^1.0.1"
+              }
+            },
+            "npm-normalize-package-bin": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.4.7",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ignore-walk": "^3.0.1",
+                "npm-bundled": "^1.0.1"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
+              }
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "once": {
+              "version": "1.4.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "wrappy": "1"
+              }
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "os-tmpdir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "osenv": {
+              "version": "0.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "os-homedir": "^1.0.0",
+                "os-tmpdir": "^1.0.0"
+              }
+            },
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "deep-extend": "^0.6.0",
+                "ini": "~1.3.0",
+                "minimist": "^1.2.0",
+                "strip-json-comments": "~2.0.1"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
+                  "dev": true,
+                  "optional": true
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "rimraf": {
+              "version": "2.7.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "safer-buffer": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "sax": {
+              "version": "1.2.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "semver": {
+              "version": "5.7.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "set-blocking": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            },
+            "strip-json-comments": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "tar": {
+              "version": "4.4.13",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "chownr": "^1.1.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.8.6",
+                "minizlib": "^1.2.1",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.3"
+              }
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "wide-align": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "string-width": "^1.0.2 || 2"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "yallist": {
+              "version": "3.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+          "dev": true,
+          "requires": {
+            "binary-extensions": "^1.0.0"
+          }
+        },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
         },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        }
-      }
-    },
-    "unzip-response": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
-      "dev": true
-    },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
-    "url-parse-lax": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-      "dev": true,
-      "requires": {
-        "prepend-http": "^1.0.1"
-      }
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "requires": {
-        "inherits": "2.0.1"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
         }
       }
     },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
-      "dev": true
-    },
-    "v8-compile-cache": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
-      "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==",
-      "dev": true
-    },
-    "vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-      "dev": true,
-      "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      }
-    },
     "webpack": {
-      "version": "4.41.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz",
-      "integrity": "sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==",
+      "version": "4.41.6",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz",
+      "integrity": "sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
@@ -5998,7 +5954,7 @@
         "node-libs-browser": "^2.2.1",
         "schema-utils": "^1.0.0",
         "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.1",
+        "terser-webpack-plugin": "^1.4.3",
         "watchpack": "^1.6.0",
         "webpack-sources": "^1.4.1"
       },
@@ -6055,6 +6011,12 @@
             }
           }
         },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -6075,6 +6037,22 @@
             }
           }
         },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "memory-fs": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+          "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+          "dev": true,
+          "requires": {
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
+          }
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -6096,6 +6074,30 @@
             "to-regex": "^3.0.2"
           }
         },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
@@ -6109,9 +6111,9 @@
       }
     },
     "webpack-cli": {
-      "version": "3.3.9",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz",
-      "integrity": "sha512-xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==",
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz",
+      "integrity": "sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==",
       "dev": true,
       "requires": {
         "chalk": "2.4.2",
@@ -6133,23 +6135,6 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "dev": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
         "cross-spawn": {
           "version": "6.0.5",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -6163,18 +6148,48 @@
             "which": "^1.2.9"
           }
         },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-          "dev": true
+        "enhanced-resolve": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+          "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "memory-fs": "^0.4.0",
+            "tapable": "^1.0.0"
+          }
         },
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true
         },
+        "memory-fs": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+          "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+          "dev": true,
+          "requires": {
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -6186,6 +6201,15 @@
             "strip-ansi": "^5.1.0"
           }
         },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -6204,17 +6228,6 @@
             "has-flag": "^3.0.0"
           }
         },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
-          }
-        },
         "yargs": {
           "version": "13.2.4",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
@@ -6233,16 +6246,6 @@
             "y18n": "^4.0.0",
             "yargs-parser": "^13.1.0"
           }
-        },
-        "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
         }
       }
     },
diff --git a/package.json b/package.json
index 3e00d80cd..bdf534a11 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "r",
   "displayName": "R",
   "description": "Support for R language(run,syntax,snippet)",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "author": "Yuki Ueda",
   "license": "SEE LICENSE IN LICENSE",
   "publisher": "Ikuyadeu",
@@ -118,7 +118,9 @@
       {
         "path": "./syntax/Rcpp.tmLanguage",
         "scopeName": "comment.block.r",
-        "injectTo": ["source.cpp"]
+        "injectTo": [
+          "source.cpp"
+        ]
       }
     ],
     "commands": [
@@ -398,17 +400,17 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^8.0.1",
-    "@types/mocha": "^5.2.7",
-    "@types/node": "^12.7.8",
-    "@types/vscode": "^1.40.0",
+    "@types/mocha": "^7.0.1",
+    "@types/node": "^13.7.1",
+    "@types/vscode": "^1.42.0",
     "copy-webpack-plugin": "^5.1.1",
-    "mocha": "^6.2.2",
+    "mocha": "^7.0.1",
     "node-atomizr": "^0.6.1",
-    "ts-loader": "^6.2.0",
+    "ts-loader": "^6.2.1",
     "tslint": "^6.0.0",
     "typescript": "^3.7.5",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.9",
+    "webpack": "^4.41.6",
+    "webpack-cli": "^3.3.11",
     "yamljs": "^0.3.0"
   },
   "dependencies": {
@@ -421,7 +423,7 @@
     "jquery": "^3.4.1",
     "jquery.json-viewer": "^1.4.0",
     "path": "^0.12.7",
-    "popper.js": "^1.16.0",
+    "popper.js": "^1.16.1",
     "winattr": "^3.0.0"
   }
 }

From 1317da288b448aeeb29894f4c8aa2940015bc968 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Thu, 13 Feb 2020 23:46:48 +0900
Subject: [PATCH 142/795] update vscode

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bdf534a11..2f25f85a5 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "R Markdown"
   ],
   "engines": {
-    "vscode": "^1.40.0"
+    "vscode": "^1.42.0"
   },
   "activationEvents": [
     "onLanguage:r",

From 4a108e1fc1c673d3fd3746128cbf1b63747b0984 Mon Sep 17 00:00:00 2001
From: Andrew 
Date: Sun, 16 Feb 2020 16:53:38 +0900
Subject: [PATCH 143/795] Remove non-bracket code chunks from R Markdown
 grammar

---
 package.json                         |  47 +--------
 syntax/Markdown Redcarpet.tmLanguage | 140 ---------------------------
 2 files changed, 4 insertions(+), 183 deletions(-)

diff --git a/package.json b/package.json
index 9a2bb8209..26a8bc36c 100644
--- a/package.json
+++ b/package.json
@@ -122,49 +122,10 @@
         "path": "./syntax/Markdown Redcarpet.tmLanguage",
         "injectTo": ["text.html.rmarkdown"],
         "embeddedLanguages": {
-					"meta.embedded.block.html": "html",
-					"source.js": "javascript",
-					"source.css": "css",
-					"meta.embedded.block.frontmatter": "yaml",
-					"meta.embedded.block.css": "css",
-					"meta.embedded.block.ini": "ini",
-					"meta.embedded.block.java": "java",
-					"meta.embedded.block.lua": "lua",
-					"meta.embedded.block.makefile": "makefile",
-					"meta.embedded.block.perl": "perl",
-					"meta.embedded.block.r": "r",
-					"meta.embedded.block.ruby": "ruby",
-					"meta.embedded.block.php": "php",
-					"meta.embedded.block.sql": "sql",
-					"meta.embedded.block.vs_net": "vs_net",
-					"meta.embedded.block.xml": "xml",
-					"meta.embedded.block.xsl": "xsl",
-					"meta.embedded.block.yaml": "yaml",
-					"meta.embedded.block.dosbatch": "dosbatch",
-					"meta.embedded.block.clojure": "clojure",
-					"meta.embedded.block.coffee": "coffee",
-					"meta.embedded.block.c": "c",
-					"meta.embedded.block.cpp": "cpp",
-					"meta.embedded.block.diff": "diff",
-					"meta.embedded.block.dockerfile": "dockerfile",
-					"meta.embedded.block.go": "go",
-					"meta.embedded.block.groovy": "groovy",
-					"meta.embedded.block.pug": "jade",
-					"meta.embedded.block.javascript": "javascript",
-					"meta.embedded.block.json": "json",
-					"meta.embedded.block.less": "less",
-					"meta.embedded.block.objc": "objc",
-					"meta.embedded.block.scss": "scss",
-					"meta.embedded.block.perl6": "perl6",
-					"meta.embedded.block.powershell": "powershell",
-					"meta.embedded.block.python": "python",
-					"meta.embedded.block.rust": "rust",
-					"meta.embedded.block.scala": "scala",
-					"meta.embedded.block.shellscript": "shellscript",
-					"meta.embedded.block.typescript": "typescript",
-					"meta.embedded.block.typescriptreact": "typescriptreact",
-					"meta.embedded.block.csharp": "csharp",
-					"meta.embedded.block.fsharp": "fsharp"
+          "meta.embedded.block.c": "c",
+          "meta.embedded.block.cpp": "cpp",
+          "meta.embedded.block.r": "r",
+          "meta.embedded.block.yaml": "yaml"
         }
       },
       {
diff --git a/syntax/Markdown Redcarpet.tmLanguage b/syntax/Markdown Redcarpet.tmLanguage
index ef42d8ab8..04a552a4c 100644
--- a/syntax/Markdown Redcarpet.tmLanguage	
+++ b/syntax/Markdown Redcarpet.tmLanguage	
@@ -24,34 +24,6 @@
 		
 			patterns
 			
-				
-					include
-					#fenced_block_ruby
-				
-				
-					include
-					#fenced_block_javascript
-				
-				
-					include
-					#fenced_block_coffee
-				
-				
-					include
-					#fenced_block_elixir
-				
-				
-					include
-					#fenced_block_shell
-				
-				
-					include
-					#fenced_block_haml
-				
-				
-					include
-					#fenced_block_html
-				
 				
 					include
 					#fenced_block_r
@@ -103,22 +75,6 @@
 						
 					
 				
-				fenced_block_coffee
-				
-					begin
-					(^|\G)([`]{3})[ ]*(?:coffee|coffeescript)$
-					end
-					(^|\G)([`]{3})($|\z)
-					name
-					meta.embedded.block.coffee
-					patterns
-					
-						
-							include
-							source.coffee
-						
-					
-				
 				fenced_block_cpp
 				
 					begin
@@ -135,70 +91,6 @@
 						
 					
 				
-				fenced_block_elixir
-				
-					begin
-					(^|\G)([`]{3})[ ]*(?:elixir)$
-					end
-					(^|\G)([`]{3})($|\z)
-					name
-					meta.embedded.block.elixer
-					patterns
-					
-						
-							include
-							source.elixir
-						
-					
-				
-				fenced_block_haml
-				
-					begin
-					(^|\G)([`]{3})[ ]*(?:haml)$
-					end
-					(^|\G)([`]{3})($|\z)
-					name
-					meta.embedded.block.haml
-					patterns
-					
-						
-							include
-							text.haml
-						
-					
-				
-				fenced_block_html
-				
-					begin
-					(^|\G)([`]{3})[ ]*(?:html)$
-					end
-					(^|\G)([`]{3})($|\z)
-					name
-					meta.embedded.block.html
-					patterns
-					
-						
-							include
-							text.html.basic
-						
-					
-				
-				fenced_block_javascript
-				
-					begin
-					(^|\G)([`]{3})[ ]*(?:js|javascript)$
-					end
-					(^|\G)([`]{3})($|\z)
-					name
-					meta.embedded.block.js
-					patterns
-					
-						
-							include
-							source.js
-						
-					
-				
 				fenced_block_r
 				
 					begin
@@ -215,38 +107,6 @@
 						
 					
 				
-				fenced_block_ruby
-				
-					begin
-					(^|\G)([`]{3})[ ]*(?:rb|ruby)$
-					end
-					(^|\G)([`]{3})($|\z)
-					name
-					meta.embedded.block.ruby
-					patterns
-					
-						
-							include
-							source.ruby
-						
-					
-				
-				fenced_block_shell
-				
-					begin
-					(^|\G)([`]{3})[ ]*(?:bash|shell|sh)$
-					end
-					(^|\G)([`]{3})($|\z)
-					name
-					meta.embedded.block.shell
-					patterns
-					
-						
-							include
-							source.shell
-						
-					
-				
 				fenced_block_yaml
 				
 					begin

From 9c300be01e7c997517c5f06b145b9092f9552253 Mon Sep 17 00:00:00 2001
From: Miles McBain 
Date: Tue, 18 Feb 2020 22:29:38 +1000
Subject: [PATCH 144/795] string interpolation command runner

---
 package.json     | 16 ++++++++++++++--
 src/extension.ts | 17 +++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 2f25f85a5..3f298a62d 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,9 @@
     "onCommand:r.runSourcewithEcho",
     "onCommand:r.runSelection",
     "onCommand:r.runSelectionInActiveTerm",
-    "onCommand:r.createGitignore"
+    "onCommand:r.createGitignore",
+    "onCommand:r.runCommandWithSelectionOrWord",
+    "onCommand:r.runCommand"
   ],
   "main": "./dist/extension",
   "contributes": {
@@ -251,6 +253,16 @@
         "title": "Show Plot History",
         "category": "R",
         "command": "r.showPlotHistory"
+      },
+      {
+        "title": "Run Command With Selection or Word in Terminal",
+        "category": "R",
+        "command": "r.runCommandWithSelectionOrWord"
+      },
+      {
+        "title": "Run Command in Terminal",
+        "category": "R",
+        "command": "r.runCommand"
       }
     ],
     "keybindings": [
@@ -426,4 +438,4 @@
     "popper.js": "^1.16.1",
     "winattr": "^3.0.0"
   }
-}
+}
\ No newline at end of file
diff --git a/src/extension.ts b/src/extension.ts
index 6ae6e80d9..f720d55a1 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -93,6 +93,21 @@ export function activate(context: ExtensionContext) {
         runTextInTerm(callableTerminal, wrappedText);
     }
 
+    async function runCommandWithSelectionOrWord(rCommand: string) {
+        const text = getWordOrSelection().join("\n");
+        const callableTerminal = await chooseTerminal();
+
+        const call = rCommand.replace("$1", text)
+
+        runTextInTerm(callableTerminal, [call]);
+    }
+
+    async function runCommand(rCommand: string) {
+        const callableTerminal = await chooseTerminal();
+
+        runTextInTerm(callableTerminal, [rCommand]);
+    }
+
     languages.registerCompletionItemProvider("r", {
         provideCompletionItems(document: TextDocument, position: Position) {
             if (document.lineAt(position).text
@@ -137,6 +152,8 @@ export function activate(context: ExtensionContext) {
         commands.registerCommand("r.document", () => chooseTerminalAndSendText("devtools::document()")),
         commands.registerCommand("r.attachActive", attachActive),
         commands.registerCommand("r.showPlotHistory", showPlotHistory),
+        commands.registerCommand("r.runCommandWithSelectionOrWord", runCommandWithSelectionOrWord),
+        commands.registerCommand("r.runCommand", runCommand),
         window.onDidCloseTerminal(deleteTerminal),
     );
 

From 46756d45c6f122d7f0b282829a84890f0c4f20b3 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 19 Feb 2020 07:43:41 +0800
Subject: [PATCH 145/795] Change platform gui in init.R

---
 R/init.R | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/R/init.R b/R/init.R
index 329789bbf..494b6beae 100644
--- a/R/init.R
+++ b/R/init.R
@@ -232,6 +232,10 @@ if (interactive() && Sys.getenv("TERM_PROGRAM") == "vscode") {
         }, "base")
         rebind("View", dataview, "utils")
 
+        platform <- .Platform
+        platform$GUI <- "vscode"
+        rebind(".Platform", platform, "base")
+
         update()
         removeTaskCallback("vscode-R")
         addTaskCallback(update, name = "vscode-R")
@@ -243,6 +247,6 @@ if (interactive() && Sys.getenv("TERM_PROGRAM") == "vscode") {
       invisible()
     })
   } else {
-    message("VSCode R Session Watcher requires jsonlite. Please install it with install.packages(\"jsonlite\")")
+    message("VSCode R Session Watcher requires jsonlite. Please install it with install.packages(\"jsonlite\").")
   }
 }

From 1c0801f83a73af6512d0e2f7e449e35deed2748f Mon Sep 17 00:00:00 2001
From: Miles McBain 
Date: Thu, 20 Feb 2020 22:46:51 +1000
Subject: [PATCH 146/795] add runCommandWithPath and clean

- clean up cod stylee of other runCommand* functions
---
 package.json     |  6 ++++++
 src/extension.ts | 13 ++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 3f298a62d..d303d6201 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "onCommand:r.runSelectionInActiveTerm",
     "onCommand:r.createGitignore",
     "onCommand:r.runCommandWithSelectionOrWord",
+    "onCommand:r.runCommandWithEditorPath",
     "onCommand:r.runCommand"
   ],
   "main": "./dist/extension",
@@ -259,6 +260,11 @@
         "category": "R",
         "command": "r.runCommandWithSelectionOrWord"
       },
+      {
+        "title": "Run Command With Editor Path in Terminal",
+        "category": "R",
+        "command": "r.runCommandWithEditorPath"
+      },
       {
         "title": "Run Command in Terminal",
         "category": "R",
diff --git a/src/extension.ts b/src/extension.ts
index f720d55a1..55fa7086c 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -96,15 +96,21 @@ export function activate(context: ExtensionContext) {
     async function runCommandWithSelectionOrWord(rCommand: string) {
         const text = getWordOrSelection().join("\n");
         const callableTerminal = await chooseTerminal();
+        let call = rCommand.replace("$1", text);
+        runTextInTerm(callableTerminal, [call]);
+    }
 
-        const call = rCommand.replace("$1", text)
-
+    async function runCommandWithEditorPath(rCommand: string) {
+        const wad: TextDocument = window.activeTextEditor.document;
+        wad.save();
+        const callableTerminal = await chooseTerminal();
+        let rPath = ToRStringLiteral(wad.fileName, '"');
+        let call = rCommand.replace("$1",rPath);
         runTextInTerm(callableTerminal, [call]);
     }
 
     async function runCommand(rCommand: string) {
         const callableTerminal = await chooseTerminal();
-
         runTextInTerm(callableTerminal, [rCommand]);
     }
 
@@ -153,6 +159,7 @@ export function activate(context: ExtensionContext) {
         commands.registerCommand("r.attachActive", attachActive),
         commands.registerCommand("r.showPlotHistory", showPlotHistory),
         commands.registerCommand("r.runCommandWithSelectionOrWord", runCommandWithSelectionOrWord),
+        commands.registerCommand("r.runCommandWithEditorPath", runCommandWithEditorPath),
         commands.registerCommand("r.runCommand", runCommand),
         window.onDidCloseTerminal(deleteTerminal),
     );

From 01d3e4e15d99b6a07e0a65335444fb904ad9b572 Mon Sep 17 00:00:00 2001
From: Miles McBain 
Date: Fri, 21 Feb 2020 20:47:09 +1000
Subject: [PATCH 147/795] swtich to '$$' replacement target, editor paths
 unquoted

---
 src/extension.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index 55fa7086c..809849ad2 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -96,7 +96,7 @@ export function activate(context: ExtensionContext) {
     async function runCommandWithSelectionOrWord(rCommand: string) {
         const text = getWordOrSelection().join("\n");
         const callableTerminal = await chooseTerminal();
-        let call = rCommand.replace("$1", text);
+        let call = rCommand.replace("$$", text);
         runTextInTerm(callableTerminal, [call]);
     }
 
@@ -104,8 +104,8 @@ export function activate(context: ExtensionContext) {
         const wad: TextDocument = window.activeTextEditor.document;
         wad.save();
         const callableTerminal = await chooseTerminal();
-        let rPath = ToRStringLiteral(wad.fileName, '"');
-        let call = rCommand.replace("$1",rPath);
+        let rPath = ToRStringLiteral(wad.fileName, "");
+        let call = rCommand.replace("$$",rPath);
         runTextInTerm(callableTerminal, [call]);
     }
 

From 726b44751d68923744c11043308f864863c3a5f2 Mon Sep 17 00:00:00 2001
From: Miles McBain 
Date: Fri, 21 Feb 2020 21:13:16 +1000
Subject: [PATCH 148/795] Add command runner function doco to README

---
 README.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/README.md b/README.md
index 396a29a8a..2dcdaeedc 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,8 @@ Requires [R](https://www.r-project.org/).
 
 * Package development short cut (`Load All`, `Test Package`, `Install Package`, `Build Package` and `Document`)
 
+* Bind keys to custom R commands using command runner functions (`r.runCommand`, `r.runCommandWithEditorPath`, `r.runCommandWithSelectionOrWord`)
+
 ## Requirements
 
 * R base from 
@@ -139,6 +141,43 @@ attach to currently active session.
 *The R terminal used in the screenshot is [radian](https://github.com/randy3k/radian) which is cross-platform and
 supports syntax highlighting, auto-completion and many other features.*
 
+## Creating keybindings for R commands
+
+There are 3 ways you can use extension functions to create keybindings that run R commands in the terminal:
+
+1. `r.runCommand` to make a keybinding to run any R expression. 
+2. `r.runCommandWithEditorPath` to create a keybinding for an R expression where the placeholder value `$$` is interpolated with the current file path.
+3. `runCommandWithSelectionOrWord` to create a keybinding for an R expression where `$$` is interpolated with the current selection or the current word the cursor is on.
+
+Here are some example entries from `keybindings.json`:
+
+```
+[
+    {
+        "description": "run drake::r_make()",
+        "key": "ctrl+;",
+        "command": "r.runCommand",
+        "when": "editorTextFocus",
+        "args": "drake::r_make()"
+    },
+    {
+        "description": "load drake target at cursor",
+        "key": "ctrl+shift+;",
+        "command": "r.runCommandWithSelectionOrWord",
+        "when": "editorTextFocus",
+        "args": "drake::loadd($$)"
+    },
+    {
+        "description": "knit to html",
+        "key": "ctrl+i",
+        "command": "r.runCommandWithEditorPath",
+        "when": "editorTextFocus",
+        "args": "rmarkdown::render($$, output_format = rmarkdown::html_document(), output_dir = \".\", clean = TRUE)"
+    },
+...
+]
+```
+
 ## TODO
 
 * Debug

From 925173050102209a7ed57ac82aaf153d777577e4 Mon Sep 17 00:00:00 2001
From: Miles McBain 
Date: Fri, 21 Feb 2020 21:30:55 +1000
Subject: [PATCH 149/795] add quotes to runCommandWithPath example

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2dcdaeedc..34f4a4899 100644
--- a/README.md
+++ b/README.md
@@ -172,7 +172,7 @@ Here are some example entries from `keybindings.json`:
         "key": "ctrl+i",
         "command": "r.runCommandWithEditorPath",
         "when": "editorTextFocus",
-        "args": "rmarkdown::render($$, output_format = rmarkdown::html_document(), output_dir = \".\", clean = TRUE)"
+        "args": "rmarkdown::render('$$', output_format = rmarkdown::html_document(), output_dir = \".\", clean = TRUE)"
     },
 ...
 ]

From 2a1a22b1547a680c5ad014d544977df06c19aec9 Mon Sep 17 00:00:00 2001
From: Miles McBain 
Date: Sat, 22 Feb 2020 22:42:22 +1000
Subject: [PATCH 150/795] handle unsaved and unititled files

in runCommandWithEditorPath
---
 src/extension.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index 809849ad2..4ae0c5fc5 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -101,8 +101,23 @@ export function activate(context: ExtensionContext) {
     }
 
     async function runCommandWithEditorPath(rCommand: string) {
-        const wad: TextDocument = window.activeTextEditor.document;
-        wad.save();
+        let wad: TextDocument = window.activeTextEditor.document;
+        let is_saved :boolean;
+        
+        if (wad.isUntitled){
+            throw("Doucment is unsaved. Please save and retry running R command.")
+        }
+
+        if (wad.isDirty) {
+           is_saved = await wad.save();
+        } else {
+           is_saved = true;
+        }
+
+        if (!is_saved){
+            throw("Cannot run R command: Document could not be saved.")
+        }
+        
         const callableTerminal = await chooseTerminal();
         let rPath = ToRStringLiteral(wad.fileName, "");
         let call = rCommand.replace("$$",rPath);

From bfea8c363a90a48bf35a0a8854225827545b660d Mon Sep 17 00:00:00 2001
From: Miles McBain 
Date: Sat, 22 Feb 2020 23:24:15 +1000
Subject: [PATCH 151/795] global replace enabled for $$

---
 src/extension.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index 4ae0c5fc5..c9e4828b8 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -96,7 +96,7 @@ export function activate(context: ExtensionContext) {
     async function runCommandWithSelectionOrWord(rCommand: string) {
         const text = getWordOrSelection().join("\n");
         const callableTerminal = await chooseTerminal();
-        let call = rCommand.replace("$$", text);
+        let call = rCommand.replace(/\$\$/g, text);
         runTextInTerm(callableTerminal, [call]);
     }
 
@@ -120,7 +120,7 @@ export function activate(context: ExtensionContext) {
         
         const callableTerminal = await chooseTerminal();
         let rPath = ToRStringLiteral(wad.fileName, "");
-        let call = rCommand.replace("$$",rPath);
+        let call = rCommand.replace(/\$\$/g,rPath);
         runTextInTerm(callableTerminal, [call]);
     }
 

From 80e8a67cd718436f19d847844c6fbf85101f3a6c Mon Sep 17 00:00:00 2001
From: Miles McBain 
Date: Sat, 22 Feb 2020 23:38:51 +1000
Subject: [PATCH 152/795] use escaped double quotes in keybinding example

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 34f4a4899..70807c52b 100644
--- a/README.md
+++ b/README.md
@@ -172,7 +172,7 @@ Here are some example entries from `keybindings.json`:
         "key": "ctrl+i",
         "command": "r.runCommandWithEditorPath",
         "when": "editorTextFocus",
-        "args": "rmarkdown::render('$$', output_format = rmarkdown::html_document(), output_dir = \".\", clean = TRUE)"
+        "args": "rmarkdown::render(\"$$\", output_format = rmarkdown::html_document(), output_dir = \".\", clean = TRUE)"
     },
 ...
 ]

From 5e5a6561824c502e9c09fda21894f15e4d0c0b1e Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sat, 22 Feb 2020 21:54:52 +0800
Subject: [PATCH 153/795] Minor refine README.md

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 70807c52b..7ab5eff28 100644
--- a/README.md
+++ b/README.md
@@ -145,13 +145,13 @@ supports syntax highlighting, auto-completion and many other features.*
 
 There are 3 ways you can use extension functions to create keybindings that run R commands in the terminal:
 
-1. `r.runCommand` to make a keybinding to run any R expression. 
+1. `r.runCommand` to make a keybinding to run any R expression.
 2. `r.runCommandWithEditorPath` to create a keybinding for an R expression where the placeholder value `$$` is interpolated with the current file path.
 3. `runCommandWithSelectionOrWord` to create a keybinding for an R expression where `$$` is interpolated with the current selection or the current word the cursor is on.
 
 Here are some example entries from `keybindings.json`:
 
-```
+```json
 [
     {
         "description": "run drake::r_make()",
@@ -173,8 +173,7 @@ Here are some example entries from `keybindings.json`:
         "command": "r.runCommandWithEditorPath",
         "when": "editorTextFocus",
         "args": "rmarkdown::render(\"$$\", output_format = rmarkdown::html_document(), output_dir = \".\", clean = TRUE)"
-    },
-...
+    }
 ]
 ```
 

From 335b03d245b760e47230c030ae3c0c923555d4f1 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Mon, 24 Feb 2020 17:54:41 +0900
Subject: [PATCH 154/795] refactor

---
 package-lock.json | 20 +++++-----
 package.json      | 14 ++++---
 src/extension.ts  | 32 +++++++---------
 src/rGitignore.ts |  2 +-
 src/rTerminal.ts  |  4 +-
 src/session.ts    | 93 +++++++++++++++++++++++++----------------------
 6 files changed, 85 insertions(+), 80 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ce9f8ad84..28b87084b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "r",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -25,9 +25,9 @@
       }
     },
     "@types/fs-extra": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.0.1.tgz",
-      "integrity": "sha512-J00cVDALmi/hJOYsunyT52Hva5TnJeKP5yd1r+mH/ZU0mbYZflR0Z5kw5kITtKTRYMhm1JMClOFYdHnQszEvqw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -40,9 +40,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "13.7.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz",
-      "integrity": "sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==",
+      "version": "13.7.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz",
+      "integrity": "sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw==",
       "dev": true
     },
     "@types/vscode": {
@@ -4957,9 +4957,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "3.7.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz",
-      "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==",
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz",
+      "integrity": "sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==",
       "dev": true
     },
     "union-value": {
diff --git a/package.json b/package.json
index 067317bde..e4f237d46 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "r",
   "displayName": "R",
   "description": "Support for R language(run,syntax,snippet)",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "author": "Yuki Ueda",
   "license": "SEE LICENSE IN LICENSE",
   "publisher": "Ikuyadeu",
@@ -123,7 +123,9 @@
       {
         "scopeName": "text.html.markdown.redcarpet",
         "path": "./syntax/Markdown Redcarpet.tmLanguage",
-        "injectTo": ["text.html.rmarkdown"],
+        "injectTo": [
+          "text.html.rmarkdown"
+        ],
         "embeddedLanguages": {
           "meta.embedded.block.c": "c",
           "meta.embedded.block.cpp": "cpp",
@@ -430,16 +432,16 @@
     "test-compile": "tsc -p ./"
   },
   "devDependencies": {
-    "@types/fs-extra": "^8.0.1",
+    "@types/fs-extra": "^8.1.0",
     "@types/mocha": "^7.0.1",
-    "@types/node": "^13.7.1",
+    "@types/node": "^13.7.4",
     "@types/vscode": "^1.42.0",
     "copy-webpack-plugin": "^5.1.1",
     "mocha": "^7.0.1",
     "node-atomizr": "^0.6.1",
     "ts-loader": "^6.2.1",
     "tslint": "^6.0.0",
-    "typescript": "^3.7.5",
+    "typescript": "^3.8.2",
     "webpack": "^4.41.6",
     "webpack-cli": "^3.3.11",
     "yamljs": "^0.3.0"
@@ -457,4 +459,4 @@
     "popper.js": "^1.16.1",
     "winattr": "^3.0.0"
   }
-}
\ No newline at end of file
+}
diff --git a/src/extension.ts b/src/extension.ts
index c9e4828b8..ecbf1f63d 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -94,33 +94,29 @@ export function activate(context: ExtensionContext) {
     }
 
     async function runCommandWithSelectionOrWord(rCommand: string) {
-        const text = getWordOrSelection().join("\n");
+        const text = getWordOrSelection()
+                    .join("\n");
         const callableTerminal = await chooseTerminal();
-        let call = rCommand.replace(/\$\$/g, text);
+        const call = rCommand.replace(/\$\$/g, text);
         runTextInTerm(callableTerminal, [call]);
     }
 
     async function runCommandWithEditorPath(rCommand: string) {
-        let wad: TextDocument = window.activeTextEditor.document;
-        let is_saved :boolean;
-        
-        if (wad.isUntitled){
-            throw("Doucment is unsaved. Please save and retry running R command.")
-        }
+        const wad: TextDocument = window.activeTextEditor.document;
+        let isSaved: boolean;
 
-        if (wad.isDirty) {
-           is_saved = await wad.save();
-        } else {
-           is_saved = true;
+        if (wad.isUntitled) {
+            throw new Error("Doucment is unsaved. Please save and retry running R command.");
         }
+        isSaved = wad.isDirty ? (await wad.save()) : true;
 
-        if (!is_saved){
-            throw("Cannot run R command: Document could not be saved.")
+        if (!isSaved) {
+            throw new Error("Cannot run R command: Document could not be saved.");
         }
-        
+
         const callableTerminal = await chooseTerminal();
-        let rPath = ToRStringLiteral(wad.fileName, "");
-        let call = rCommand.replace(/\$\$/g,rPath);
+        const rPath = ToRStringLiteral(wad.fileName, "");
+        const call = rCommand.replace(/\$\$/g, rPath);
         runTextInTerm(callableTerminal, [call]);
     }
 
@@ -186,7 +182,7 @@ export function activate(context: ExtensionContext) {
                 const wordRange = document.getWordRangeAtPosition(position);
                 const text = document.getText(wordRange);
 
-                return new Hover("```\n" + globalenv[text].str + "\n```");
+                return new Hover(`\`\`\`\n${globalenv[text].str}\n\`\`\``);
             },
         });
 
diff --git a/src/rGitignore.ts b/src/rGitignore.ts
index da0a7b1b2..6104b45b4 100644
--- a/src/rGitignore.ts
+++ b/src/rGitignore.ts
@@ -21,7 +21,7 @@ const ignoreFiles = [".Rhistory",
                      "rsconnect/"].join("\n");
 
 export function createGitignore() {
-    if (!workspace.workspaceFolders[0].uri.path) {
+    if (workspace.workspaceFolders[0].uri.path === undefined) {
         window.showWarningMessage("Please open workspace to create .gitignore");
 
         return;
diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index f5da17b6e..74b35882b 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -29,7 +29,7 @@ export function createRTerm(preserveshow?: boolean): boolean {
                 if (config.get("sessionWatcher")) {
                     termOptions.env = {
                         R_PROFILE_USER_OLD: process.env.R_PROFILE_USER,
-                        R_PROFILE_USER: path.join(os.homedir(), ".vscode-R", ".Rprofile")
+                        R_PROFILE_USER: path.join(os.homedir(), ".vscode-R", ".Rprofile"),
                     };
                 }
                 rTerm = window.createTerminal(termOptions);
@@ -65,7 +65,7 @@ export async function chooseTerminal(active: boolean = false) {
 
     if (window.terminals.length > 0) {
         const rTermNameOpinions = ["R", "R Interactive"];
-        if (window.activeTerminal) {
+        if (window.activeTerminal !== undefined) {
             const activeTerminalName = window.activeTerminal.name;
             if (rTermNameOpinions.includes(activeTerminalName)) {
                 return window.activeTerminal;
diff --git a/src/session.ts b/src/session.ts
index 73a31fb63..bcd924e9e 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -14,7 +14,7 @@ export let globalenv: any;
 let responseWatcher: FileSystemWatcher;
 let globalEnvWatcher: FileSystemWatcher;
 let plotWatcher: FileSystemWatcher;
-let PID: string;
+let pid: string;
 let tempDir: string;
 let plotDir: string;
 let resDir: string;
@@ -22,10 +22,10 @@ let responseLineCount: number;
 const sessionDir = path.join(".vscode", "vscode-R");
 
 export function deploySessionWatcher(extensionPath: string) {
-    console.info("[deploySessionWatcher] extensionPath: " + extensionPath);
+    console.info(`[deploySessionWatcher] extensionPath: ${extensionPath}`);
     resDir = path.join(extensionPath, "dist", "resources");
     const targetDir = path.join(os.homedir(), ".vscode-R");
-    console.info("[deploySessionWatcher] targetDir: " + targetDir);
+    console.info(`[deploySessionWatcher] targetDir: ${targetDir}`);
     if (!fs.existsSync(targetDir)) {
         console.info("[deploySessionWatcher] targetDir not exists, create directory");
         fs.mkdirSync(targetDir);
@@ -59,15 +59,16 @@ export function attachActive() {
 }
 
 function removeDirectory(dir: string) {
-    console.info("[removeDirectory] dir: " + dir);
+    console.info(`[removeDirectory] dir: ${dir}`);
     if (fs.existsSync(dir)) {
         console.info("[removeDirectory] dir exists");
-        fs.readdirSync(dir).forEach((file) => {
-            const curPath = path.join(dir, file);
-            console.info("[removeDirectory] Remove " + curPath);
-            fs.unlinkSync(curPath);
+        fs.readdirSync(dir)
+          .forEach((file) => {
+              const curPath = path.join(dir, file);
+              console.info(`[removeDirectory] Remove ${curPath}`);
+              fs.unlinkSync(curPath);
         });
-        console.info("[removeDirectory] Remove dir " + dir);
+        console.info(`[removeDirectory] Remove dir ${dir}`);
         fs.rmdirSync(dir);
     }
     console.info("[removeDirectory] Done");
@@ -75,7 +76,7 @@ function removeDirectory(dir: string) {
 
 export function removeSessionFiles() {
     const sessionPath = path.join(
-        workspace.workspaceFolders[0].uri.fsPath, sessionDir, PID);
+        workspace.workspaceFolders[0].uri.fsPath, sessionDir, pid);
     console.info("[removeSessionFiles] ", sessionPath);
     if (fs.existsSync(sessionPath)) {
         removeDirectory(sessionPath);
@@ -84,19 +85,19 @@ export function removeSessionFiles() {
 }
 
 function updateSessionWatcher() {
-    console.info("[updateSessionWatcher] PID: " + PID);
+    console.info(`[updateSessionWatcher] PID: ${pid}`);
     console.info("[updateSessionWatcher] Create globalEnvWatcher");
     globalEnvWatcher = workspace.createFileSystemWatcher(
         new RelativePattern(
             workspace.workspaceFolders[0],
-            path.join(sessionDir, PID, "globalenv.json")));
+            path.join(sessionDir, pid, "globalenv.json")));
     globalEnvWatcher.onDidChange(updateGlobalenv);
 
     console.info("[updateSessionWatcher] Create plotWatcher");
     plotWatcher = workspace.createFileSystemWatcher(
         new RelativePattern(
             workspace.workspaceFolders[0],
-            path.join(sessionDir, PID, "plot.png")));
+            path.join(sessionDir, pid, "plot.png")));
     plotWatcher.onDidCreate(updatePlot);
     plotWatcher.onDidChange(updatePlot);
 
@@ -105,8 +106,8 @@ function updateSessionWatcher() {
 
 function _updatePlot() {
     const plotPath = path.join(workspace.workspaceFolders[0].uri.fsPath,
-                               sessionDir, PID, "plot.png");
-    console.info("[_updatePlot] " + plotPath);
+                               sessionDir, pid, "plot.png");
+    console.info(`[_updatePlot] ${plotPath}`);
     if (fs.existsSync(plotPath)) {
         commands.executeCommand("vscode.open", Uri.file(plotPath), {
             preserveFocus: true,
@@ -123,8 +124,8 @@ function updatePlot(event) {
 
 async function _updateGlobalenv() {
     const globalenvPath = path.join(workspace.workspaceFolders[0].uri.fsPath,
-                                    sessionDir, PID, "globalenv.json");
-    console.info("[_updateGlobalenv] " + globalenvPath);
+                                    sessionDir, pid, "globalenv.json");
+    console.info(`[_updateGlobalenv] ${globalenvPath}`);
     const content = await fs.readFile(globalenvPath, "utf8");
     globalenv = JSON.parse(content);
     console.info("[_updateGlobalenv] Done");
@@ -135,7 +136,7 @@ async function updateGlobalenv(event) {
 }
 
 function showBrowser(url: string) {
-    console.info("[showBrowser] uri: " + url);
+    console.info(`[showBrowser] uri: ${url}`);
     const port = parseInt(new URL(url).port, 10);
     const panel = window.createWebviewPanel(
         "browser",
@@ -176,7 +177,7 @@ function getBrowserHtml(url: string) {
 }
 
 async function showWebView(file: string, viewColumn: ViewColumn) {
-    console.info("[showWebView] file: " + file);
+    console.info(`[showWebView] file: ${file}`);
     const dir = path.dirname(file);
     const panel = window.createWebviewPanel("webview", "WebView",
                                             {
@@ -191,7 +192,8 @@ async function showWebView(file: string, viewColumn: ViewColumn) {
     const content = await fs.readFile(file);
     const html = content.toString()
         .replace("", "
Date: Mon, 24 Feb 2020 18:01:08 +0900
Subject: [PATCH 155/795] version 1.2.4

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04f16159d..62d150ded 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 1.2.4
+
+* Add configurable command runner functions (Thank you @MilesMCBain)
+* Change .Platform$GUI to vscode on session start
+* Fixed the function snippet (Fixed #230) (Thank you @stanmart)
+* Add statement of languageserver features to bug report template (Fixed #210)
+* Inject R Markdown features into Markdown grammar (Fixed #220, #116, #48, #36)
+
 ## 1.2.3
 * Fixed the function snippet (Fixed #230) (Thank you @stanmart)
 * Update activationEvents

From 05a88843aea203d1931901ff08367f877913a42b Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sun, 23 Feb 2020 00:44:00 +0800
Subject: [PATCH 156/795] Check untitled document and save result before
 running command

---
 src/extension.ts | 85 ++++++++++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index ecbf1f63d..d1998e128 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -37,33 +37,54 @@ export function activate(context: ExtensionContext) {
     // Now provide the implementation of the command with  registerCommand
     // The commandId parameter must match the command field in package.json
 
-    function runSource(echo: boolean)  {
+    async function saveDocument(document: TextDocument) {
+        if (document.isUntitled) {
+            window.showErrorMessage("Document is unsaved. Please save and retry running R command.");
+
+            return false;
+        }
+
+        const isSaved: boolean = document.isDirty ? await document.save() : true;
+        if (!isSaved) {
+            window.showErrorMessage("Cannot run R command: document could not be saved.");
+
+            return false;
+        }
+
+        return true;
+    }
+
+    async function runSource(echo: boolean)  {
         const wad = window.activeTextEditor.document;
-        wad.save();
-        let rPath: string = ToRStringLiteral(wad.fileName, '"');
-        let encodingParam = config.get("source.encoding");
-        encodingParam = `encoding = "${encodingParam}"`;
-        rPath = [rPath, encodingParam].join(", ");
-        if (echo) {
-            rPath = [rPath, "echo = TRUE"].join(", ");
+        const isSaved = await saveDocument(wad);
+        if (isSaved) {
+            let rPath: string = ToRStringLiteral(wad.fileName, '"');
+            let encodingParam = config.get("source.encoding");
+            encodingParam = `encoding = "${encodingParam}"`;
+            rPath = [rPath, encodingParam].join(", ");
+            if (echo) {
+                rPath = [rPath, "echo = TRUE"].join(", ");
+            }
+            chooseTerminalAndSendText(`source(${rPath})`);
         }
-        chooseTerminalAndSendText(`source(${rPath})`);
     }
 
-    function knitRmd(echo: boolean, outputFormat: string)  {
+    async function knitRmd(echo: boolean, outputFormat: string)  {
         const wad: TextDocument = window.activeTextEditor.document;
-        wad.save();
-        let rPath = ToRStringLiteral(wad.fileName, '"');
-        let encodingParam = config.get("source.encoding");
-        encodingParam = `encoding = "${encodingParam}"`;
-        rPath = [rPath, encodingParam].join(", ");
-        if (echo) {
-            rPath = [rPath, "echo = TRUE"].join(", ");
-        }
-        if (outputFormat === undefined) {
-            chooseTerminalAndSendText(`rmarkdown::render(${rPath})`);
-        } else {
-            chooseTerminalAndSendText(`rmarkdown::render(${rPath}, "${outputFormat}")`);
+        const isSaved = await saveDocument(wad);
+        if (isSaved) {
+            let rPath = ToRStringLiteral(wad.fileName, '"');
+            let encodingParam = config.get("source.encoding");
+            encodingParam = `encoding = "${encodingParam}"`;
+            rPath = [rPath, encodingParam].join(", ");
+            if (echo) {
+                rPath = [rPath, "echo = TRUE"].join(", ");
+            }
+            if (outputFormat === undefined) {
+                chooseTerminalAndSendText(`rmarkdown::render(${rPath})`);
+            } else {
+                chooseTerminalAndSendText(`rmarkdown::render(${rPath}, "${outputFormat}")`);
+            }
         }
     }
 
@@ -103,21 +124,13 @@ export function activate(context: ExtensionContext) {
 
     async function runCommandWithEditorPath(rCommand: string) {
         const wad: TextDocument = window.activeTextEditor.document;
-        let isSaved: boolean;
-
-        if (wad.isUntitled) {
-            throw new Error("Doucment is unsaved. Please save and retry running R command.");
-        }
-        isSaved = wad.isDirty ? (await wad.save()) : true;
-
-        if (!isSaved) {
-            throw new Error("Cannot run R command: Document could not be saved.");
+        const isSaved = await saveDocument(wad);
+        if (isSaved) {
+            const callableTerminal = await chooseTerminal();
+            const rPath = ToRStringLiteral(wad.fileName, "");
+            const call = rCommand.replace(/\$\$/g, rPath);
+            runTextInTerm(callableTerminal, [call]);
         }
-
-        const callableTerminal = await chooseTerminal();
-        const rPath = ToRStringLiteral(wad.fileName, "");
-        const call = rCommand.replace(/\$\$/g, rPath);
-        runTextInTerm(callableTerminal, [call]);
     }
 
     async function runCommand(rCommand: string) {

From f102a2db2a34023e3414064b8db38f66cf23e7a9 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Mon, 24 Feb 2020 17:28:25 +0800
Subject: [PATCH 157/795] Update code

---
 src/extension.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/extension.ts b/src/extension.ts
index d1998e128..84b1d5e6b 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -44,7 +44,7 @@ export function activate(context: ExtensionContext) {
             return false;
         }
 
-        const isSaved: boolean = document.isDirty ? await document.save() : true;
+        const isSaved: boolean = document.isDirty ? (await document.save()) : true;
         if (!isSaved) {
             window.showErrorMessage("Cannot run R command: document could not be saved.");
 

From b6c9aa44d907babdfea12d34df574874a0c9f2cf Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Tue, 25 Feb 2020 10:28:53 +0900
Subject: [PATCH 158/795] version 1.2.5

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62d150ded..f98864355 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.2.5
+
+* Check untitled document and save result before running command
+
 ## 1.2.4
 
 * Add configurable command runner functions (Thank you @MilesMCBain)
diff --git a/package-lock.json b/package-lock.json
index 28b87084b..d440b6626 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "r",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e4f237d46..8e7a7a17d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "r",
   "displayName": "R",
   "description": "Support for R language(run,syntax,snippet)",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "author": "Yuki Ueda",
   "license": "SEE LICENSE IN LICENSE",
   "publisher": "Ikuyadeu",

From 0893e7af94c296efd2a1780a7db1a9b8da8a1c26 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Thu, 27 Feb 2020 23:49:45 +0800
Subject: [PATCH 159/795] Fix showWebView

---
 src/session.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/session.ts b/src/session.ts
index bcd924e9e..00312df0d 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -193,7 +193,7 @@ async function showWebView(file: string, viewColumn: ViewColumn) {
     const html = content.toString()
         .replace("", "
Date: Fri, 28 Feb 2020 10:07:08 +0900
Subject: [PATCH 160/795] version 1.2.6

---
 CHANGELOG.md      |  4 ++++
 package-lock.json | 24 ++++++++++++------------
 package.json      |  6 +++---
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f98864355..271ed649c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.2.6
+
+* Fix showWebView
+
 ## 1.2.5
 
 * Check untitled document and save result before running command
diff --git a/package-lock.json b/package-lock.json
index d440b6626..c097dc8c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "r",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -40,9 +40,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "13.7.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz",
-      "integrity": "sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw==",
+      "version": "13.7.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.6.tgz",
+      "integrity": "sha512-eyK7MWD0R1HqVTp+PtwRgFeIsemzuj4gBFSQxfPHY5iMjS7474e5wq+VFgTcdpyHeNxyKSaetYAjdMLJlKoWqA==",
       "dev": true
     },
     "@types/vscode": {
@@ -2859,12 +2859,12 @@
       "dev": true
     },
     "log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.1"
+        "chalk": "^2.4.2"
       }
     },
     "lowercase-keys": {
@@ -3160,9 +3160,9 @@
       "dev": true
     },
     "mocha": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.0.1.tgz",
-      "integrity": "sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.1.0.tgz",
+      "integrity": "sha512-MymHK8UkU0K15Q/zX7uflZgVoRWiTjy0fXE/QjKts6mowUvGxOdPhZ2qj3b0iZdUrNZlW9LAIMFHB4IW+2b3EQ==",
       "dev": true,
       "requires": {
         "ansi-colors": "3.2.3",
@@ -3176,7 +3176,7 @@
         "growl": "1.10.5",
         "he": "1.2.0",
         "js-yaml": "3.13.1",
-        "log-symbols": "2.2.0",
+        "log-symbols": "3.0.0",
         "minimatch": "3.0.4",
         "mkdirp": "0.5.1",
         "ms": "2.1.1",
diff --git a/package.json b/package.json
index 8e7a7a17d..a60be9c97 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "r",
   "displayName": "R",
   "description": "Support for R language(run,syntax,snippet)",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "author": "Yuki Ueda",
   "license": "SEE LICENSE IN LICENSE",
   "publisher": "Ikuyadeu",
@@ -434,10 +434,10 @@
   "devDependencies": {
     "@types/fs-extra": "^8.1.0",
     "@types/mocha": "^7.0.1",
-    "@types/node": "^13.7.4",
+    "@types/node": "^13.7.6",
     "@types/vscode": "^1.42.0",
     "copy-webpack-plugin": "^5.1.1",
-    "mocha": "^7.0.1",
+    "mocha": "^7.1.0",
     "node-atomizr": "^0.6.1",
     "ts-loader": "^6.2.1",
     "tslint": "^6.0.0",

From 881efa126d2a96181e459fb02b75ca1d64a83216 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sun, 1 Mar 2020 21:20:03 +0800
Subject: [PATCH 161/795] Add lint workflows

---
 .github/workflows/lintr.yaml | 26 ++++++++++++++++++++++++++
 .github/workflows/tslint.yml | 15 +++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 .github/workflows/lintr.yaml
 create mode 100644 .github/workflows/tslint.yml

diff --git a/.github/workflows/lintr.yaml b/.github/workflows/lintr.yaml
new file mode 100644
index 000000000..7fd3a36f6
--- /dev/null
+++ b/.github/workflows/lintr.yaml
@@ -0,0 +1,26 @@
+name: lint
+on: [push, pull_request]
+jobs:
+  linux:
+    if: contains(github.event.head_commit.message, '[ci skip]') == false
+    strategy:
+      matrix:
+        r: [latest]
+    runs-on: ubuntu-latest
+    container: rocker/tidyverse:${{ matrix.r }}
+    steps:
+    - uses: actions/checkout@v1
+    - name: Install apt-get dependencies
+      run: |
+        apt-get update
+        apt-get install git ssh curl bzip2 libffi6 libffi-dev -y
+    - name: Install lintr
+      run: |
+        Rscript -e "install.packages('lintr', repos = 'https://cloud.r-project.org')"
+      shell:
+        bash
+    - name: Running lintr
+      run: |
+        Rscript -e "lintr::lint_dir('./R')"
+      shell:
+        bash
diff --git a/.github/workflows/tslint.yml b/.github/workflows/tslint.yml
new file mode 100644
index 000000000..b537275d3
--- /dev/null
+++ b/.github/workflows/tslint.yml
@@ -0,0 +1,15 @@
+name: tslint
+on: [push, pull_request]
+jobs:
+  job:
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+    steps:
+      - uses: actions/checkout@v1
+      - name: Prepare
+        run: npm ci
+      - name: Lint
+        uses: mooyoul/tslint-actions@v1.1.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          pattern: 'src/*.ts'

From 213a796705bdc976e92286eb321e7a220dd96d0f Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sun, 1 Mar 2020 21:21:43 +0800
Subject: [PATCH 162/795] Rename lint action name

---
 .github/workflows/lintr.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lintr.yaml b/.github/workflows/lintr.yaml
index 7fd3a36f6..57a07b40e 100644
--- a/.github/workflows/lintr.yaml
+++ b/.github/workflows/lintr.yaml
@@ -1,4 +1,4 @@
-name: lint
+name: lintr
 on: [push, pull_request]
 jobs:
   linux:

From 76483a515e7b404739b0848bd2b9ae0d82d0bc8c Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sun, 1 Mar 2020 21:26:14 +0800
Subject: [PATCH 163/795] Combine lint workflows

---
 .github/workflows/{lintr.yaml => lint.yml} | 22 +++++++++++++++-------
 .github/workflows/tslint.yml               | 15 ---------------
 2 files changed, 15 insertions(+), 22 deletions(-)
 rename .github/workflows/{lintr.yaml => lint.yml} (58%)
 delete mode 100644 .github/workflows/tslint.yml

diff --git a/.github/workflows/lintr.yaml b/.github/workflows/lint.yml
similarity index 58%
rename from .github/workflows/lintr.yaml
rename to .github/workflows/lint.yml
index 57a07b40e..9a534d902 100644
--- a/.github/workflows/lintr.yaml
+++ b/.github/workflows/lint.yml
@@ -1,13 +1,21 @@
-name: lintr
+name: lint
 on: [push, pull_request]
 jobs:
-  linux:
-    if: contains(github.event.head_commit.message, '[ci skip]') == false
-    strategy:
-      matrix:
-        r: [latest]
+  tslint:
     runs-on: ubuntu-latest
-    container: rocker/tidyverse:${{ matrix.r }}
+    timeout-minutes: 3
+    steps:
+      - uses: actions/checkout@v1
+      - name: Prepare
+        run: npm ci
+      - name: Lint
+        uses: mooyoul/tslint-actions@v1.1.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          pattern: 'src/*.ts'
+  lintr:
+    runs-on: ubuntu-latest
+    container: rocker/tidyverse:latest
     steps:
     - uses: actions/checkout@v1
     - name: Install apt-get dependencies
diff --git a/.github/workflows/tslint.yml b/.github/workflows/tslint.yml
deleted file mode 100644
index b537275d3..000000000
--- a/.github/workflows/tslint.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: tslint
-on: [push, pull_request]
-jobs:
-  job:
-    runs-on: ubuntu-latest
-    timeout-minutes: 3
-    steps:
-      - uses: actions/checkout@v1
-      - name: Prepare
-        run: npm ci
-      - name: Lint
-        uses: mooyoul/tslint-actions@v1.1.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          pattern: 'src/*.ts'

From f8f5cec630407a4a8bcb9e4eb37815b3745e4b74 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 3 Mar 2020 11:00:47 +0800
Subject: [PATCH 164/795] Add build.yml

---
 .github/workflows/build.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..69e92f04d
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,15 @@
+name: build
+on: [push, pull_request]
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - uses: lannonbr/vsce-action@master
+        with:
+          args: "package"
+      - uses: actions/upload-artifact@v1
+        with:
+          name: vsix
+          path: r-*.vsix

From 956711247fe4cbd0b2e664890a7ecb6fb131556c Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 3 Mar 2020 11:04:20 +0800
Subject: [PATCH 165/795] Fix build.yml

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69e92f04d..67d7efd46 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,8 +8,8 @@ jobs:
       - run: npm install
       - uses: lannonbr/vsce-action@master
         with:
-          args: "package"
+          args: "package -o /tmp/vscode-R.vsix"
       - uses: actions/upload-artifact@v1
         with:
           name: vsix
-          path: r-*.vsix
+          path: /tmp/vscode-R.vsix

From 9474abe683ed9073e0a8bb59034384cec46dd259 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 3 Mar 2020 11:10:16 +0800
Subject: [PATCH 166/795] Combine to single main.yml

---
 .github/workflows/build.yml | 15 -------------
 .github/workflows/lint.yml  | 34 ----------------------------
 .github/workflows/main.yml  | 45 +++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 49 deletions(-)
 delete mode 100644 .github/workflows/build.yml
 delete mode 100644 .github/workflows/lint.yml
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 67d7efd46..000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: build
-on: [push, pull_request]
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: npm install
-      - uses: lannonbr/vsce-action@master
-        with:
-          args: "package -o /tmp/vscode-R.vsix"
-      - uses: actions/upload-artifact@v1
-        with:
-          name: vsix
-          path: /tmp/vscode-R.vsix
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index 9a534d902..000000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: lint
-on: [push, pull_request]
-jobs:
-  tslint:
-    runs-on: ubuntu-latest
-    timeout-minutes: 3
-    steps:
-      - uses: actions/checkout@v1
-      - name: Prepare
-        run: npm ci
-      - name: Lint
-        uses: mooyoul/tslint-actions@v1.1.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          pattern: 'src/*.ts'
-  lintr:
-    runs-on: ubuntu-latest
-    container: rocker/tidyverse:latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: Install apt-get dependencies
-      run: |
-        apt-get update
-        apt-get install git ssh curl bzip2 libffi6 libffi-dev -y
-    - name: Install lintr
-      run: |
-        Rscript -e "install.packages('lintr', repos = 'https://cloud.r-project.org')"
-      shell:
-        bash
-    - name: Running lintr
-      run: |
-        Rscript -e "lintr::lint_dir('./R')"
-      shell:
-        bash
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 000000000..beafd1ca1
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,45 @@
+name: main
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm install
+      - uses: lannonbr/vsce-action@master
+        with:
+          args: "package -o vscode-R.vsix"
+      - uses: actions/upload-artifact@v1
+        with:
+          name: vsix
+          path: vscode-R.vsix
+  tslint:
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+    steps:
+      - uses: actions/checkout@v1
+      - name: Prepare
+        run: npm ci
+      - name: Lint
+        uses: mooyoul/tslint-actions@v1.1.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          pattern: "src/*.ts"
+  lintr:
+    runs-on: ubuntu-latest
+    container:
+      image: rocker/tidyverse:latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Install apt-get dependencies
+        run: |
+          apt-get update
+          apt-get install git ssh curl bzip2 libffi6 libffi-dev -y
+      - name: Install lintr
+        run: |
+          Rscript -e "install.packages('lintr', repos = 'https://cloud.r-project.org')"
+        shell: bash
+      - name: Running lintr
+        run: |
+          Rscript -e "lintr::lint_dir('./R')"
+        shell: bash

From 51944c1f35c3ae67b2661e207a2ee509f80cd0db Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 3 Mar 2020 11:14:00 +0800
Subject: [PATCH 167/795] Refine main.yml

---
 .github/workflows/main.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index beafd1ca1..65a3654c3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,13 +11,12 @@ jobs:
           args: "package -o vscode-R.vsix"
       - uses: actions/upload-artifact@v1
         with:
-          name: vsix
+          name: vscode-R.vsix
           path: vscode-R.vsix
   tslint:
     runs-on: ubuntu-latest
-    timeout-minutes: 3
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Prepare
         run: npm ci
       - name: Lint
@@ -30,7 +29,7 @@ jobs:
     container:
       image: rocker/tidyverse:latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Install apt-get dependencies
         run: |
           apt-get update

From 2f81e94d502dde326b069f7d2ef73f4232b085dd Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Mon, 2 Mar 2020 23:02:37 +0800
Subject: [PATCH 168/795] Use Windows registry to find R path

---
 .github/ISSUE_TEMPLATE/bug_report.md |  2 +-
 ISSUE_TEMPLATE.md                    |  2 +-
 package.json                         |  2 +-
 src/rTerminal.ts                     | 54 ++++++++++++++--------------
 src/util.ts                          | 30 +++++++++++++---
 5 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6ac60b5a4..8b892b42e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -33,7 +33,7 @@ Yes / No
 
 ```json
 // R.exe path for windows
-"r.rterm.windows": "C:\\Program Files\\R\\R-3.4.4\\bin\\x64\\R.exe",
+"r.rterm.windows": "",
 
 // R path for Mac OS X
 "r.rterm.mac": "/usr/local/bin/R",
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 3f374557e..627dacb80 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -20,7 +20,7 @@ Yes / No
 
 ```json
 // R.exe path for windows
-"r.rterm.windows": "C:\\Program Files\\R\\R-3.4.4\\bin\\x64\\R.exe",
+"r.rterm.windows": "",
 
 // R path for Mac OS X
 "r.rterm.mac": "/usr/local/bin/R",
diff --git a/package.json b/package.json
index a60be9c97..6612d5246 100644
--- a/package.json
+++ b/package.json
@@ -368,7 +368,7 @@
       "properties": {
         "r.rterm.windows": {
           "type": "string",
-          "default": "C:\\Program Files\\R\\R-3.5.0\\bin\\x64\\R.exe",
+          "default": "",
           "description": "R.exe path for windows"
         },
         "r.rterm.mac": {
diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index 74b35882b..2cf103303 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -12,36 +12,36 @@ import { removeSessionFiles } from "./session";
 import { config, delay, getRpath } from "./util";
 export let rTerm: Terminal;
 
-export function createRTerm(preserveshow?: boolean): boolean {
-        const termName = "R Interactive";
-        const termPath = getRpath();
-        if (termPath === undefined) {
-            return undefined;
-        }
-        const termOpt: string[] = config.get("rterm.option");
-        pathExists(termPath, (err, exists) => {
-            if (exists) {
-                const termOptions: TerminalOptions = {
-                    name: termName,
-                    shellPath: termPath,
-                    shellArgs: termOpt,
+export async function createRTerm(preserveshow?: boolean): Promise {
+    const termName = "R Interactive";
+    const termPath = await getRpath();
+    if (termPath === undefined) {
+        return undefined;
+    }
+    const termOpt: string[] = config.get("rterm.option");
+    pathExists(termPath, (err, exists) => {
+        if (exists) {
+            const termOptions: TerminalOptions = {
+                name: termName,
+                shellPath: termPath,
+                shellArgs: termOpt,
+            };
+            if (config.get("sessionWatcher")) {
+                termOptions.env = {
+                    R_PROFILE_USER_OLD: process.env.R_PROFILE_USER,
+                    R_PROFILE_USER: path.join(os.homedir(), ".vscode-R", ".Rprofile"),
                 };
-                if (config.get("sessionWatcher")) {
-                    termOptions.env = {
-                        R_PROFILE_USER_OLD: process.env.R_PROFILE_USER,
-                        R_PROFILE_USER: path.join(os.homedir(), ".vscode-R", ".Rprofile"),
-                    };
-                }
-                rTerm = window.createTerminal(termOptions);
-                rTerm.show(preserveshow);
-
-                return true;
             }
-            window.showErrorMessage("Cannot find R client.  Please check R path in preferences and reload.");
+            rTerm = window.createTerminal(termOptions);
+            rTerm.show(preserveshow);
 
-            return false;
-        });
-    }
+            return true;
+        }
+        window.showErrorMessage("Cannot find R client.  Please check R path in preferences and reload.");
+
+        return false;
+    });
+}
 
 export function deleteTerminal(term: Terminal) {
     if (isDeepStrictEqual(term, rTerm)) {
diff --git a/src/util.ts b/src/util.ts
index cb7607144..6b3fc6559 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -1,12 +1,34 @@
 "use strict";
 
 import { existsSync } from "fs-extra";
+import path = require("path");
 import { window, workspace } from "vscode";
+import winreg = require("winreg");
 export let config = workspace.getConfiguration("r");
 
-export function getRpath() {
+export async function getRpath() {
     if (process.platform === "win32") {
-        return config.get("rterm.windows");
+        let rpath: string = config.get("rterm.windows");
+        if (rpath === "") {
+            // Find path from registry
+            try {
+                const key = new windreg({
+                    hive: winreg.HKLM,
+                    key: "\\Software\\R-Core\\R",
+                });
+                const item: winreg.RegistryItem = await new Promise((c, e) =>
+                    key.get('InstallPath', (err, result) => err ? e(err) : c(result)));
+                const rhome: string = String(item.value);
+                rpath = path.join(rhome, "bin", "R.exe");
+            } catch (e) {
+                rpath = "";
+            }
+            if (!existsSync(rpath)) {
+                rpath = "";
+            }
+        }
+
+        return rpath;
     }
     if (process.platform === "darwin") {
         return config.get("rterm.mac");
@@ -25,7 +47,7 @@ export function ToRStringLiteral(s: string, quote: string) {
     }
 
     return (quote +
-            s.replace(/\\/g, "\\\\")
+        s.replace(/\\/g, "\\\\")
             .replace(/"""/g, `\\${quote}`)
             .replace(/\\n/g, "\\n")
             .replace(/\\r/g, "\\r")
@@ -34,7 +56,7 @@ export function ToRStringLiteral(s: string, quote: string) {
             .replace(/\\a/g, "\\a")
             .replace(/\\f/g, "\\f")
             .replace(/\\v/g, "\\v") +
-            quote);
+        quote);
 }
 
 export async function delay(ms: number) {

From e07449fe537c58e172b70d51895d1b3e25478732 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 4 Mar 2020 10:49:30 +0800
Subject: [PATCH 169/795] Refine getRpath

---
 src/rTerminal.ts |  4 ++--
 src/util.ts      | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index 2cf103303..80991f965 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -12,9 +12,9 @@ import { removeSessionFiles } from "./session";
 import { config, delay, getRpath } from "./util";
 export let rTerm: Terminal;
 
-export async function createRTerm(preserveshow?: boolean): Promise {
+export function createRTerm(preserveshow?: boolean): boolean {
     const termName = "R Interactive";
-    const termPath = await getRpath();
+    const termPath = getRpath();
     if (termPath === undefined) {
         return undefined;
     }
diff --git a/src/util.ts b/src/util.ts
index 6b3fc6559..5e1f913b8 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -6,26 +6,24 @@ import { window, workspace } from "vscode";
 import winreg = require("winreg");
 export let config = workspace.getConfiguration("r");
 
-export async function getRpath() {
+export function getRpath() {
     if (process.platform === "win32") {
         let rpath: string = config.get("rterm.windows");
         if (rpath === "") {
             // Find path from registry
             try {
-                const key = new windreg({
+                const key = new winreg({
                     hive: winreg.HKLM,
                     key: "\\Software\\R-Core\\R",
                 });
-                const item: winreg.RegistryItem = await new Promise((c, e) =>
-                    key.get('InstallPath', (err, result) => err ? e(err) : c(result)));
-                const rhome: string = String(item.value);
-                rpath = path.join(rhome, "bin", "R.exe");
+                key.get("InstallPath", (err: Error, result: winreg.RegistryItem) => {
+                    if (err !== null) {
+                        rpath = path.join(result.value, "bin", "R.exe");
+                    }
+                });
             } catch (e) {
                 rpath = "";
             }
-            if (!existsSync(rpath)) {
-                rpath = "";
-            }
         }
 
         return rpath;

From b351eed52439293354dd0c9397b88cac3dcd4070 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 4 Mar 2020 11:12:17 +0800
Subject: [PATCH 170/795] Update package dependencies

---
 package-lock.json | 10 ++++++++++
 package.json      |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index c097dc8c9..40789e8e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,6 +51,11 @@
       "integrity": "sha512-ds6TceMsh77Fs0Mq0Vap6Y72JbGWB8Bay4DrnJlf5d9ui2RSe1wis13oQm+XhguOeH1HUfLGzaDAoupTUtgabw==",
       "dev": true
     },
+    "@types/winreg": {
+      "version": "1.2.30",
+      "resolved": "https://registry.npmjs.org/@types/winreg/-/winreg-1.2.30.tgz",
+      "integrity": "sha1-kdZxDlNtNFucmwF8V0z2qNpkxRg="
+    },
     "@webassemblyjs/ast": {
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
@@ -6343,6 +6348,11 @@
         "fswin": "^3.18.918"
       }
     },
+    "winreg": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.4.tgz",
+      "integrity": "sha1-ugZWKbepJRMOFXeRCM9UCZDpjRs="
+    },
     "worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
diff --git a/package.json b/package.json
index 6612d5246..400ff5b23 100644
--- a/package.json
+++ b/package.json
@@ -436,6 +436,7 @@
     "@types/mocha": "^7.0.1",
     "@types/node": "^13.7.6",
     "@types/vscode": "^1.42.0",
+    "@types/winreg": "^1.2.30",
     "copy-webpack-plugin": "^5.1.1",
     "mocha": "^7.1.0",
     "node-atomizr": "^0.6.1",
@@ -457,6 +458,7 @@
     "jquery.json-viewer": "^1.4.0",
     "path": "^0.12.7",
     "popper.js": "^1.16.1",
-    "winattr": "^3.0.0"
+    "winattr": "^3.0.0",
+    "winreg": "^1.2.4"
   }
 }

From 7718a8e892e385e6d05e4865d889a246fb719fc0 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 4 Mar 2020 11:36:54 +0800
Subject: [PATCH 171/795] Add logging

---
 src/rTerminal.ts | 1 +
 src/util.ts      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index 80991f965..e8a87ccc3 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -15,6 +15,7 @@ export let rTerm: Terminal;
 export function createRTerm(preserveshow?: boolean): boolean {
     const termName = "R Interactive";
     const termPath = getRpath();
+    console.info(`termPath: ${termPath}`);
     if (termPath === undefined) {
         return undefined;
     }
diff --git a/src/util.ts b/src/util.ts
index 5e1f913b8..ad7e95110 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -19,9 +19,11 @@ export function getRpath() {
                 key.get("InstallPath", (err: Error, result: winreg.RegistryItem) => {
                     if (err !== null) {
                         rpath = path.join(result.value, "bin", "R.exe");
+                        console.info(`rpath: ${rpath}`);
                     }
                 });
             } catch (e) {
+                console.info("winreg error");
                 rpath = "";
             }
         }

From d392ccd880b5d31a275fbea78babdad4ce98560e Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 4 Mar 2020 11:51:45 +0800
Subject: [PATCH 172/795] Use async getRpath()

---
 src/rTerminal.ts |  4 ++--
 src/util.ts      | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index e8a87ccc3..41b3abd08 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -12,9 +12,9 @@ import { removeSessionFiles } from "./session";
 import { config, delay, getRpath } from "./util";
 export let rTerm: Terminal;
 
-export function createRTerm(preserveshow?: boolean): boolean {
+export async function createRTerm(preserveshow?: boolean): Promise {
     const termName = "R Interactive";
-    const termPath = getRpath();
+    const termPath = await getRpath();
     console.info(`termPath: ${termPath}`);
     if (termPath === undefined) {
         return undefined;
diff --git a/src/util.ts b/src/util.ts
index ad7e95110..77d36425f 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -6,7 +6,7 @@ import { window, workspace } from "vscode";
 import winreg = require("winreg");
 export let config = workspace.getConfiguration("r");
 
-export function getRpath() {
+export async function getRpath() {
     if (process.platform === "win32") {
         let rpath: string = config.get("rterm.windows");
         if (rpath === "") {
@@ -16,14 +16,10 @@ export function getRpath() {
                     hive: winreg.HKLM,
                     key: "\\Software\\R-Core\\R",
                 });
-                key.get("InstallPath", (err: Error, result: winreg.RegistryItem) => {
-                    if (err !== null) {
-                        rpath = path.join(result.value, "bin", "R.exe");
-                        console.info(`rpath: ${rpath}`);
-                    }
-                });
+                const item: winreg.RegistryItem = await new Promise((c, e) =>
+                    key.get("InstallPath", (err, result) => err === null ? c(result) : e(err)));
+                rpath = path.join(item.value, "bin", "R.exe");
             } catch (e) {
-                console.info("winreg error");
                 rpath = "";
             }
         }

From 3549d584240c58424f45d6aff0ab9ef03bca6af5 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 4 Mar 2020 12:20:40 +0800
Subject: [PATCH 173/795] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7ab5eff28..deccee11c 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@ Requires [R](https://www.r-project.org/).
 
 ## Usage
 
-* For Windows, set config `r.rterm.windows` to your `R.exe` Path like `"C:\\Program Files\\R\\R-3.3.4\\bin\\x64\\R.exe"`;
+* For Windows, if `r.rterm.windows` is empty, then the path to `R.exe` will be searched in Windows registry. If your R is not installed with path written in registry or if you need a specific R executable path, set it to a path like `"C:\\Program Files\\R\\R-3.3.4\\bin\\x64\\R.exe"`.
 * For Radian console, enable config `r.bracketedPaste`
 * Open your *folder* that has R source file (**Can't work if you open only file**)
-* Use `F1` key and `R:` command or `Ctrl+Enter`(Mac: `⌘+Enter`)
+* Use `F1` key and `R:` command or `Ctrl+Enter` (Mac: `⌘+Enter`)
 
 ## Features
 

From 9b8e8882891e516ca04de016553ea956cca5566f Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Fri, 28 Feb 2020 20:41:49 +0800
Subject: [PATCH 174/795] Fix handling group_df in dataview_table

---
 R/init.R | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/R/init.R b/R/init.R
index 494b6beae..e6f7613e9 100644
--- a/R/init.R
+++ b/R/init.R
@@ -107,6 +107,7 @@ if (interactive() && Sys.getenv("TERM_PROGRAM") == "vscode") {
 
         dataview_table <- function(data) {
           if (is.data.frame(data)) {
+            nrow <- nrow(data)
             colnames <- colnames(data)
             if (is.null(colnames)) {
               colnames <- sprintf("(X%d)", seq_len(ncol(data)))
@@ -117,15 +118,15 @@ if (interactive() && Sys.getenv("TERM_PROGRAM") == "vscode") {
               rownames <- rownames(data)
               rownames(data) <- NULL
             } else {
-              rownames <- seq_len(nrow(data))
+              rownames <- seq_len(nrow)
             }
-            data <- cbind(" " = rownames, data, stringsAsFactors = FALSE)
+            data <- c(list(" " = rownames), .subset(data))
             colnames <- c(" ", colnames)
             types <- vapply(data, dataview_data_type,
               character(1L), USE.NAMES = FALSE)
             data <- vapply(data, function(x) {
               trimws(format(x))
-            }, character(nrow(data)), USE.NAMES = FALSE)
+            }, character(nrow), USE.NAMES = FALSE)
             dim(data) <- c(length(rownames), length(colnames))
           } else if (is.matrix(data)) {
             if (is.factor(data)) {

From 6ccb222d3ed9e0877561cabe3b6be0075f5381b3 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Mon, 9 Mar 2020 10:53:45 +0900
Subject: [PATCH 175/795] try to adding eslint

---
 .eslintrc.js      |   22 +
 package-lock.json | 1308 ++++++++++++++++++++++++++++++++++++++++++++-
 package.json      |    8 +
 webpack.config.js |    8 +-
 4 files changed, 1329 insertions(+), 17 deletions(-)
 create mode 100644 .eslintrc.js

diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..acf5a24fb
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,22 @@
+module.exports = {
+    env: {
+      browser: true,
+      es6: true
+    },
+    globals: {
+      Atomics: 'readonly',
+      SharedArrayBuffer: 'readonly'
+    },
+    parser: '@typescript-eslint/parser',
+    parserOptions: {
+      ecmaVersion: 2018,
+      sourceType: 'module'
+    },
+    plugins: [
+      '@typescript-eslint',
+      'jsdoc'
+    ],
+    rules: {
+    }
+  }
+  
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 40789e8e0..fe6da79ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,18 @@
         "js-tokens": "^4.0.0"
       }
     },
+    "@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+      "dev": true
+    },
+    "@types/eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==",
+      "dev": true
+    },
     "@types/fs-extra": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -33,6 +45,12 @@
         "@types/node": "*"
       }
     },
+    "@types/json-schema": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz",
+      "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==",
+      "dev": true
+    },
     "@types/mocha": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.1.tgz",
@@ -54,7 +72,122 @@
     "@types/winreg": {
       "version": "1.2.30",
       "resolved": "https://registry.npmjs.org/@types/winreg/-/winreg-1.2.30.tgz",
-      "integrity": "sha1-kdZxDlNtNFucmwF8V0z2qNpkxRg="
+      "integrity": "sha1-kdZxDlNtNFucmwF8V0z2qNpkxRg=",
+      "dev": true
+    },
+    "@typescript-eslint/eslint-plugin": {
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.22.0.tgz",
+      "integrity": "sha512-BvxRLaTDVQ3N+Qq8BivLiE9akQLAOUfxNHIEhedOcg8B2+jY8Rc4/D+iVprvuMX1AdezFYautuGDwr9QxqSxBQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/experimental-utils": "2.22.0",
+        "eslint-utils": "^1.4.3",
+        "functional-red-black-tree": "^1.0.1",
+        "regexpp": "^3.0.0",
+        "tsutils": "^3.17.1"
+      },
+      "dependencies": {
+        "tsutils": {
+          "version": "3.17.1",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
+          "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.8.1"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/experimental-utils": {
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.22.0.tgz",
+      "integrity": "sha512-sJt1GYBe6yC0dWOQzXlp+tiuGglNhJC9eXZeC8GBVH98Zv9jtatccuhz0OF5kC/DwChqsNfghHx7OlIDQjNYAQ==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/typescript-estree": "2.22.0",
+        "eslint-scope": "^5.0.0"
+      },
+      "dependencies": {
+        "eslint-scope": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
+          "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/parser": {
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.22.0.tgz",
+      "integrity": "sha512-FaZKC1X+nvD7qMPqKFUYHz3H0TAioSVFGvG29f796Nc5tBluoqfHgLbSFKsh7mKjRoeTm8J9WX2Wo9EyZWjG7w==",
+      "dev": true,
+      "requires": {
+        "@types/eslint-visitor-keys": "^1.0.0",
+        "@typescript-eslint/experimental-utils": "2.22.0",
+        "@typescript-eslint/typescript-estree": "2.22.0",
+        "eslint-visitor-keys": "^1.1.0"
+      }
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.22.0.tgz",
+      "integrity": "sha512-2HFZW2FQc4MhIBB8WhDm9lVFaBDy6h9jGrJ4V2Uzxe/ON29HCHBTj3GkgcsgMWfsl2U5as+pTOr30Nibaw7qRQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "eslint-visitor-keys": "^1.1.0",
+        "glob": "^7.1.6",
+        "is-glob": "^4.0.1",
+        "lodash": "^4.17.15",
+        "semver": "^6.3.0",
+        "tsutils": "^3.17.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "tsutils": {
+          "version": "3.17.1",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
+          "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.8.1"
+          }
+        }
+      }
     },
     "@webassemblyjs/ast": {
       "version": "1.8.5",
@@ -250,6 +383,12 @@
       "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
       "dev": true
     },
+    "acorn-jsx": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
+      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
+      "dev": true
+    },
     "ajv": {
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
@@ -289,6 +428,23 @@
       "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
       "dev": true
     },
+    "ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.11.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+          "dev": true
+        }
+      }
+    },
     "ansi-regex": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -347,6 +503,17 @@
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
+    "array-includes": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
+      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0",
+        "is-string": "^1.0.5"
+      }
+    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -368,6 +535,16 @@
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true
     },
+    "array.prototype.flat": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
+      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      }
+    },
     "asn1.js": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
@@ -395,6 +572,12 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true
+    },
     "async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
@@ -772,6 +955,12 @@
         "unset-value": "^1.0.0"
       }
     },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
     "camelcase": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
@@ -806,6 +995,12 @@
         }
       }
     },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
     "chokidar": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
@@ -893,6 +1088,21 @@
       "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
       "dev": true
     },
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^3.1.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
     "cliui": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -1065,6 +1275,12 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
+    "contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true
+    },
     "copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@@ -1291,6 +1507,12 @@
       "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==",
       "dev": true
     },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -1383,6 +1605,15 @@
         "path-type": "^3.0.0"
       }
     },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -1549,6 +1780,376 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
+    "eslint": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.10.0",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^1.4.3",
+        "eslint-visitor-keys": "^1.1.0",
+        "espree": "^6.1.2",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^7.0.0",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.14",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.3",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^6.1.2",
+        "strip-ansi": "^5.2.0",
+        "strip-json-comments": "^3.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "dev": true
+            }
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "eslint-scope": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
+          "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "glob-parent": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
+          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        },
+        "regexpp": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+          "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
+          "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-config-standard": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.0.tgz",
+      "integrity": "sha512-EF6XkrrGVbvv8hL/kYa/m6vnvmUT+K82pJJc4JJVMM6+Qgqh0pnwprSxdduDLB9p/7bIxD+YV5O0wfb8lmcPbA==",
+      "dev": true
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
+      "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.9",
+        "resolve": "^1.13.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz",
+      "integrity": "sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.9",
+        "pkg-dir": "^2.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.1.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-es": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz",
+      "integrity": "sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng==",
+      "dev": true,
+      "requires": {
+        "eslint-utils": "^2.0.0",
+        "regexpp": "^3.0.0"
+      },
+      "dependencies": {
+        "eslint-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
+          "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^1.1.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz",
+      "integrity": "sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.0.3",
+        "array.prototype.flat": "^1.2.1",
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.9",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.2",
+        "eslint-module-utils": "^2.4.1",
+        "has": "^1.0.3",
+        "minimatch": "^3.0.4",
+        "object.values": "^1.1.0",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.12.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-node": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz",
+      "integrity": "sha512-chUs/NVID+sknFiJzxoN9lM7uKSOEta8GC8365hw1nDfwIPIjjpRSwwPvQanWv8dt/pDe9EV4anmVSwdiSndNg==",
+      "dev": true,
+      "requires": {
+        "eslint-plugin-es": "^3.0.0",
+        "eslint-utils": "^2.0.0",
+        "ignore": "^5.1.1",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.10.1",
+        "semver": "^6.1.0"
+      },
+      "dependencies": {
+        "eslint-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
+          "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^1.1.0"
+          }
+        },
+        "ignore": {
+          "version": "5.1.4",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
+          "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-promise": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz",
+      "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==",
+      "dev": true
+    },
+    "eslint-plugin-standard": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz",
+      "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==",
+      "dev": true
+    },
     "eslint-scope": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
@@ -1559,12 +2160,55 @@
         "estraverse": "^4.1.1"
       }
     },
+    "eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.1.0"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
+      "dev": true
+    },
+    "espree": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.0.tgz",
+      "integrity": "sha512-Xs8airJ7RQolnDIbLtRutmfvSsAe0xqMMAantCN/GMoqf81TFbeI1T7Jpd56qYu1uuh32dOG5W/X9uO+ghPXzA==",
+      "dev": true,
+      "requires": {
+        "acorn": "^7.1.0",
+        "acorn-jsx": "^5.2.0",
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+          "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
+          "dev": true
+        }
+      }
+    },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true
     },
+    "esquery": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz",
+      "integrity": "sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
@@ -1697,6 +2341,17 @@
         }
       }
     },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      }
+    },
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
@@ -1774,12 +2429,36 @@
       "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
       "dev": true
     },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
     "figgy-pudding": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
       "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
       "dev": true
     },
+    "figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^2.0.1"
+      }
+    },
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -1972,6 +2651,34 @@
         "is-buffer": "~2.0.3"
       }
     },
+    "flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "requires": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "flatted": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+      "dev": true
+    },
     "flush-write-stream": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
@@ -2132,6 +2839,12 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -2244,6 +2957,15 @@
         "which": "^1.2.14"
       }
     },
+    "globals": {
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz",
+      "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.8.1"
+      }
+    },
     "globby": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
@@ -2413,12 +3135,27 @@
         "parse-passwd": "^1.0.0"
       }
     },
+    "hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
+    },
     "https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
       "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
       "dev": true
     },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
@@ -2437,6 +3174,24 @@
       "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
       "dev": true
     },
+    "import-fresh": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true
+        }
+      }
+    },
     "import-lazy": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
@@ -2475,18 +3230,129 @@
         "wrappy": "1"
       }
     },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true
-    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.6.tgz",
+      "integrity": "sha512-7SVO4h+QIdMq6XcqIqrNte3gS5MzCCKZdsq9DO4PJziBFNYzP3PGFbDjgadDb//MCahzgjCxvQ/O2wa7kx9o4w==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^3.0.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.15",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.5.3",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "interpret": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
@@ -2685,6 +3551,12 @@
         "isobject": "^3.0.1"
       }
     },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
     "is-redirect": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
@@ -2712,6 +3584,12 @@
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
       "dev": true
     },
+    "is-string": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "dev": true
+    },
     "is-symbol": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
@@ -2789,6 +3667,12 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
     "json5": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
@@ -2830,6 +3714,45 @@
         "invert-kv": "^2.0.0"
       }
     },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
     "loader-runner": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -3227,6 +4150,12 @@
       "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
       "dev": true
     },
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
     "nan": {
       "version": "2.14.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
@@ -3253,6 +4182,12 @@
         "to-regex": "^3.0.1"
       }
     },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
     "neo-async": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
@@ -3478,6 +4413,18 @@
         }
       }
     },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -3588,6 +4535,18 @@
         "isobject": "^3.0.1"
       }
     },
+    "object.values": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      }
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -3603,6 +4562,29 @@
       "integrity": "sha1-+yCDFtesKVG9zGlqfYZL8hr3oAg=",
       "dev": true
     },
+    "onetime": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      }
+    },
     "os-browserify": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
@@ -3659,6 +4641,12 @@
         }
       }
     },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
     "p-defer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
@@ -3762,6 +4750,15 @@
         }
       }
     },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
     "parse-asn1": {
       "version": "5.1.5",
       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
@@ -3913,6 +4910,12 @@
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
       "dev": true
     },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
     "prepend-http": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
@@ -3930,6 +4933,12 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
     "promise-inflight": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
@@ -4044,6 +5053,89 @@
         "strip-json-comments": "~2.0.1"
       }
     },
+    "read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^2.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^2.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^2.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        }
+      }
+    },
     "readable-stream": {
       "version": "1.0.34",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -4083,6 +5175,12 @@
         "safe-regex": "^1.1.0"
       }
     },
+    "regexpp": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz",
+      "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==",
+      "dev": true
+    },
     "registry-auth-token": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
@@ -4185,6 +5283,16 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
+    "restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "requires": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -4210,6 +5318,15 @@
         "inherits": "^2.0.1"
       }
     },
+    "run-async": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz",
+      "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==",
+      "dev": true,
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -4219,6 +5336,15 @@
         "aproba": "^1.1.1"
       }
     },
+    "rxjs": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+      "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -4234,6 +5360,12 @@
         "ret": "~0.1.10"
       }
     },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -4344,6 +5476,17 @@
       "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
       "dev": true
     },
+    "slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -4521,6 +5664,38 @@
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
       "dev": true
     },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "dev": true
+    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -4714,6 +5889,12 @@
         "ansi-regex": "^3.0.0"
       }
     },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
+    },
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
@@ -4735,6 +5916,46 @@
         "has-flag": "^3.0.0"
       }
     },
+    "table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
     "tapable": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
@@ -4800,6 +6021,18 @@
         }
       }
     },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
     "through2": {
       "version": "0.6.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
@@ -4825,6 +6058,15 @@
         "setimmediate": "^1.0.4"
       }
     },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -4955,6 +6197,21 @@
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
       "dev": true
     },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true
+    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -5150,6 +6407,16 @@
       "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==",
       "dev": true
     },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
     "vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
@@ -6353,6 +7620,12 @@
       "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.4.tgz",
       "integrity": "sha1-ugZWKbepJRMOFXeRCM9UCZDpjRs="
     },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
     "worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
@@ -6407,6 +7680,15 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
+    "write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
     "write-file-atomic": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
diff --git a/package.json b/package.json
index 400ff5b23..38f1483c5 100644
--- a/package.json
+++ b/package.json
@@ -437,7 +437,15 @@
     "@types/node": "^13.7.6",
     "@types/vscode": "^1.42.0",
     "@types/winreg": "^1.2.30",
+    "@typescript-eslint/eslint-plugin": "^2.22.0",
+    "@typescript-eslint/parser": "^2.22.0",
     "copy-webpack-plugin": "^5.1.1",
+    "eslint": "^6.8.0",
+    "eslint-config-standard": "^14.1.0",
+    "eslint-plugin-import": "^2.20.1",
+    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
     "mocha": "^7.1.0",
     "node-atomizr": "^0.6.1",
     "ts-loader": "^6.2.1",
diff --git a/webpack.config.js b/webpack.config.js
index 56e6eb12e..bf93b0e7d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,8 +2,8 @@
 
 'use strict';
 
-const path = require('path');
-const CopyPlugin = require('copy-webpack-plugin');
+import { resolve as _resolve } from 'path';
+import CopyPlugin from 'copy-webpack-plugin';
 
 /**@type {import('webpack').Configuration}*/
 const config = {
@@ -12,7 +12,7 @@ const config = {
   entry: './src/extension.ts', // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
   output: {
     // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
-    path: path.resolve(__dirname, 'dist'),
+    path: _resolve(__dirname, 'dist'),
     filename: 'extension.js',
     libraryTarget: 'commonjs2',
     devtoolModuleFilenameTemplate: '../[resource-path]'
@@ -57,4 +57,4 @@ const config = {
     ]),
   ],
 };
-module.exports = config;
+export default config;

From b2c322190eac4f288dd4206470884e670b40410d Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Mon, 9 Mar 2020 11:15:27 +0900
Subject: [PATCH 176/795] version 1.2.7

---
 CHANGELOG.md      | 7 +++++++
 package-lock.json | 5 +++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 271ed649c..d68b94fb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 1.2.7
+
+* Add [new wiki page](https://github.com/Ikuyadeu/vscode-R/wiki) !
+* Use Windows registry to find R path
+* Fix handling grouped_df in dataview_table
+* Use GitHub Actions for linting 
+
 ## 1.2.6
 
 * Fix showWebView
diff --git a/package-lock.json b/package-lock.json
index 40789e8e0..c1bf0f334 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "r",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -54,7 +54,8 @@
     "@types/winreg": {
       "version": "1.2.30",
       "resolved": "https://registry.npmjs.org/@types/winreg/-/winreg-1.2.30.tgz",
-      "integrity": "sha1-kdZxDlNtNFucmwF8V0z2qNpkxRg="
+      "integrity": "sha1-kdZxDlNtNFucmwF8V0z2qNpkxRg=",
+      "dev": true
     },
     "@webassemblyjs/ast": {
       "version": "1.8.5",
diff --git a/package.json b/package.json
index 400ff5b23..afa37eb96 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "r",
   "displayName": "R",
   "description": "Support for R language(run,syntax,snippet)",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "author": "Yuki Ueda",
   "license": "SEE LICENSE IN LICENSE",
   "publisher": "Ikuyadeu",

From d782cd66a4bbdcb0bca6565e9fb45b7c6d5f9df2 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Thu, 19 Mar 2020 14:38:05 +0900
Subject: [PATCH 177/795] Add wiki link on README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index deccee11c..0ecc854c8 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@ Requires [R](https://www.r-project.org/).
 
 ## Usage
 
+Full document is on the [wiki](https://github.com/Ikuyadeu/vscode-R/wiki)
+
 * For Windows, if `r.rterm.windows` is empty, then the path to `R.exe` will be searched in Windows registry. If your R is not installed with path written in registry or if you need a specific R executable path, set it to a path like `"C:\\Program Files\\R\\R-3.3.4\\bin\\x64\\R.exe"`.
 * For Radian console, enable config `r.bracketedPaste`
 * Open your *folder* that has R source file (**Can't work if you open only file**)

From 50f6b43ff1ede26f1843a9d3c61f45a0fa393522 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Tue, 24 Mar 2020 18:00:57 +0900
Subject: [PATCH 178/795] fix extension tslint to eslint

---
 .vscode/extentions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/extentions.json b/.vscode/extentions.json
index 1f5f26ab3..43760d32a 100644
--- a/.vscode/extentions.json
+++ b/.vscode/extentions.json
@@ -1,6 +1,6 @@
 {
         "recommendations": [
-                "eg2.tslint",
+                "dbaeumer.vscode-eslint",
                 "GrapeCity.gc-excelviewer"
 	]
 }
\ No newline at end of file

From f4693a8c468ba7d44db27ff9fb6ba4f4f68a28c0 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Tue, 24 Mar 2020 18:01:24 +0900
Subject: [PATCH 179/795] support single quote

---
 r-configuration.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/r-configuration.json b/r-configuration.json
index 6c6e98410..c416a6910 100644
--- a/r-configuration.json
+++ b/r-configuration.json
@@ -11,13 +11,15 @@
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
-		["\"", "\""]
+		["\"", "\""],
+		["'", "'"]
 	],
 	"surroundingPairs": [
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
-		["\"", "\""]
+		["\"", "\""],
+		["'", "'"]
     ],
   "folding": {
 		"markers": {

From 3f873e849299994d5993e1698977326596207863 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Wed, 25 Mar 2020 10:45:58 +0900
Subject: [PATCH 180/795] add backtick support

---
 r-configuration.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/r-configuration.json b/r-configuration.json
index c416a6910..a7b01f156 100644
--- a/r-configuration.json
+++ b/r-configuration.json
@@ -12,14 +12,16 @@
 		["[", "]"],
 		["(", ")"],
 		["\"", "\""],
-		["'", "'"]
+		["'", "'"],
+		["`", "`"]
 	],
 	"surroundingPairs": [
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
 		["\"", "\""],
-		["'", "'"]
+		["'", "'"],
+		["`", "`"]
     ],
   "folding": {
 		"markers": {

From 104a673117c2b8d54384992cdd143eee686e1eeb Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Wed, 25 Mar 2020 11:17:26 +0900
Subject: [PATCH 181/795] fix #265

---
 package-lock.json | 570 +++++++++++++++++++++++-----------------------
 package.json      |  10 +-
 webpack.config.js |   8 +-
 3 files changed, 297 insertions(+), 291 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0891d04ec..4cf523b8f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,21 +52,21 @@
       "dev": true
     },
     "@types/mocha": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.1.tgz",
-      "integrity": "sha512-L/Nw/2e5KUaprNJoRA33oly+M8X8n0K+FwLTbYqwTcR14wdPWeRkigBLfSFpN/Asf9ENZTMZwLxjtjeYucAA4Q==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz",
+      "integrity": "sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==",
       "dev": true
     },
     "@types/node": {
-      "version": "13.7.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.6.tgz",
-      "integrity": "sha512-eyK7MWD0R1HqVTp+PtwRgFeIsemzuj4gBFSQxfPHY5iMjS7474e5wq+VFgTcdpyHeNxyKSaetYAjdMLJlKoWqA==",
+      "version": "13.9.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz",
+      "integrity": "sha512-01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA==",
       "dev": true
     },
     "@types/vscode": {
-      "version": "1.42.0",
-      "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.42.0.tgz",
-      "integrity": "sha512-ds6TceMsh77Fs0Mq0Vap6Y72JbGWB8Bay4DrnJlf5d9ui2RSe1wis13oQm+XhguOeH1HUfLGzaDAoupTUtgabw==",
+      "version": "1.43.0",
+      "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.43.0.tgz",
+      "integrity": "sha512-kIaR9qzd80rJOxePKpCB/mdy00mz8Apt2QA5Y6rdrKFn13QNFNeP3Hzmsf37Bwh/3cS7QjtAeGSK7wSqAU0sYQ==",
       "dev": true
     },
     "@types/winreg": {
@@ -76,13 +76,12 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.22.0.tgz",
-      "integrity": "sha512-BvxRLaTDVQ3N+Qq8BivLiE9akQLAOUfxNHIEhedOcg8B2+jY8Rc4/D+iVprvuMX1AdezFYautuGDwr9QxqSxBQ==",
+      "version": "2.25.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.25.0.tgz",
+      "integrity": "sha512-W2YyMtjmlrOjtXc+FtTelVs9OhuR6OlYc4XKIslJ8PUJOqgYYAPRJhAqkYRQo3G4sjvG8jSodsNycEn4W2gHUw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "2.22.0",
-        "eslint-utils": "^1.4.3",
+        "@typescript-eslint/experimental-utils": "2.25.0",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.0.0",
         "tsutils": "^3.17.1"
@@ -100,14 +99,15 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.22.0.tgz",
-      "integrity": "sha512-sJt1GYBe6yC0dWOQzXlp+tiuGglNhJC9eXZeC8GBVH98Zv9jtatccuhz0OF5kC/DwChqsNfghHx7OlIDQjNYAQ==",
+      "version": "2.25.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.25.0.tgz",
+      "integrity": "sha512-0IZ4ZR5QkFYbaJk+8eJ2kYeA+1tzOE1sBjbwwtSV85oNWYUBep+EyhlZ7DLUCyhMUGuJpcCCFL0fDtYAP1zMZw==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/typescript-estree": "2.22.0",
-        "eslint-scope": "^5.0.0"
+        "@typescript-eslint/typescript-estree": "2.25.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
       },
       "dependencies": {
         "eslint-scope": {
@@ -119,25 +119,34 @@
             "esrecurse": "^4.1.0",
             "estraverse": "^4.1.1"
           }
+        },
+        "eslint-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
+          "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^1.1.0"
+          }
         }
       }
     },
     "@typescript-eslint/parser": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.22.0.tgz",
-      "integrity": "sha512-FaZKC1X+nvD7qMPqKFUYHz3H0TAioSVFGvG29f796Nc5tBluoqfHgLbSFKsh7mKjRoeTm8J9WX2Wo9EyZWjG7w==",
+      "version": "2.25.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.25.0.tgz",
+      "integrity": "sha512-mccBLaBSpNVgp191CP5W+8U1crTyXsRziWliCqzj02kpxdjKMvFHGJbK33NroquH3zB/gZ8H511HEsJBa2fNEg==",
       "dev": true,
       "requires": {
         "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "2.22.0",
-        "@typescript-eslint/typescript-estree": "2.22.0",
+        "@typescript-eslint/experimental-utils": "2.25.0",
+        "@typescript-eslint/typescript-estree": "2.25.0",
         "eslint-visitor-keys": "^1.1.0"
       }
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.22.0.tgz",
-      "integrity": "sha512-2HFZW2FQc4MhIBB8WhDm9lVFaBDy6h9jGrJ4V2Uzxe/ON29HCHBTj3GkgcsgMWfsl2U5as+pTOr30Nibaw7qRQ==",
+      "version": "2.25.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz",
+      "integrity": "sha512-VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
@@ -190,178 +199,177 @@
       }
     },
     "@webassemblyjs/ast": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5"
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
       "dev": true
     },
     "@webassemblyjs/helper-code-frame": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/wast-printer": "1.9.0"
       }
     },
     "@webassemblyjs/helper-fsm": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
       "dev": true
     },
     "@webassemblyjs/helper-module-context": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "^0.0.3"
+        "@webassemblyjs/ast": "1.9.0"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
       "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/helper-wasm-section": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-opt": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
       }
     },
     "@webassemblyjs/wast-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-code-frame": "1.8.5",
-        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -378,9 +386,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-      "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
       "dev": true
     },
     "acorn-jsx": {
@@ -564,6 +572,23 @@
       "requires": {
         "object-assign": "^4.1.1",
         "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
       }
     },
     "assign-symbols": {
@@ -584,6 +609,11 @@
       "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
       "dev": true
     },
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
+    },
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -872,12 +902,6 @@
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
       "dev": true
     },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
-    },
     "builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -1018,9 +1042,9 @@
       },
       "dependencies": {
         "glob-parent": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
@@ -1916,9 +1940,9 @@
       }
     },
     "eslint-config-standard": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.0.tgz",
-      "integrity": "sha512-EF6XkrrGVbvv8hL/kYa/m6vnvmUT+K82pJJc4JJVMM6+Qgqh0pnwprSxdduDLB9p/7bIxD+YV5O0wfb8lmcPbA==",
+      "version": "14.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz",
+      "integrity": "sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg==",
       "dev": true
     },
     "eslint-import-resolver-node": {
@@ -2787,19 +2811,20 @@
       }
     },
     "fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
+      "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
       "requires": {
+        "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "jsonfile": "^6.0.1",
+        "universalify": "^1.0.0"
       },
       "dependencies": {
         "graceful-fs": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz",
-          "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg=="
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
         }
       }
     },
@@ -3683,11 +3708,12 @@
       }
     },
     "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
+      "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
       "requires": {
-        "graceful-fs": "^4.1.6"
+        "graceful-fs": "^4.1.6",
+        "universalify": "^1.0.0"
       }
     },
     "kind-of": {
@@ -3820,12 +3846,6 @@
         "pify": "^3.0.0"
       }
     },
-    "mamacro": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-      "dev": true
-    },
     "map-age-cleaner": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -4088,9 +4108,9 @@
       "dev": true
     },
     "mocha": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.1.0.tgz",
-      "integrity": "sha512-MymHK8UkU0K15Q/zX7uflZgVoRWiTjy0fXE/QjKts6mowUvGxOdPhZ2qj3b0iZdUrNZlW9LAIMFHB4IW+2b3EQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz",
+      "integrity": "sha512-3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA==",
       "dev": true,
       "requires": {
         "ansi-colors": "3.2.3",
@@ -4106,7 +4126,7 @@
         "js-yaml": "3.13.1",
         "log-symbols": "3.0.0",
         "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
+        "mkdirp": "0.5.3",
         "ms": "2.1.1",
         "node-environment-flags": "1.0.6",
         "object.assign": "4.1.0",
@@ -4114,11 +4134,32 @@
         "supports-color": "6.0.0",
         "which": "1.3.1",
         "wide-align": "1.1.3",
-        "yargs": "13.3.0",
-        "yargs-parser": "13.1.1",
+        "yargs": "13.3.2",
+        "yargs-parser": "13.1.2",
         "yargs-unparser": "1.6.0"
       },
       "dependencies": {
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
+          "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -4127,6 +4168,16 @@
           "requires": {
             "isexe": "^2.0.0"
           }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
         }
       }
     },
@@ -4401,15 +4452,6 @@
               "dev": true
             }
           }
-        },
-        "util": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-          "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
         }
       }
     },
@@ -4794,15 +4836,6 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
-    "path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
-      "requires": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      }
-    },
     "path-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -4868,9 +4901,9 @@
       }
     },
     "picomatch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz",
-      "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
       "dev": true
     },
     "pify": {
@@ -4925,7 +4958,8 @@
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
     },
     "process-nextick-args": {
       "version": "2.0.1",
@@ -5972,9 +6006,9 @@
       }
     },
     "terser": {
-      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz",
-      "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==",
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz",
+      "integrity": "sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -6121,9 +6155,9 @@
       }
     },
     "ts-loader": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.1.tgz",
-      "integrity": "sha512-Dd9FekWuABGgjE1g0TlQJ+4dFUfYGbYcs52/HQObE0ZmUNjQlmLAS7xXsSzy23AMaMwipsx5sNHvoEpT2CZq1g==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz",
+      "integrity": "sha512-HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ==",
       "dev": true,
       "requires": {
         "chalk": "^2.3.0",
@@ -6147,50 +6181,6 @@
       "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
       "dev": true
     },
-    "tslint": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.0.0.tgz",
-      "integrity": "sha512-9nLya8GBtlFmmFMW7oXXwoXS1NkrccqTqAtwXzdPV9e2mqSEvCki6iHL/Fbzi5oqbugshzgGPk7KBb2qNP1DSA==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^4.0.1",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.10.0",
-        "tsutils": "^2.29.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "diff": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-          "dev": true
-        }
-      }
-    },
-    "tsutils": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      }
-    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -6219,9 +6209,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz",
-      "integrity": "sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
+      "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
       "dev": true
     },
     "union-value": {
@@ -6264,9 +6254,9 @@
       }
     },
     "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="
     },
     "unset-value": {
       "version": "1.0.0",
@@ -6375,18 +6365,12 @@
       "dev": true
     },
     "util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
       "requires": {
-        "inherits": "2.0.1"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
-        }
+        "inherits": "2.0.3"
       }
     },
     "util-deprecate": {
@@ -6534,9 +6518,9 @@
           }
         },
         "fsevents": {
-          "version": "1.2.11",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
-          "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
+          "version": "1.2.12",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz",
+          "integrity": "sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -6590,7 +6574,7 @@
               }
             },
             "chownr": {
-              "version": "1.1.3",
+              "version": "1.1.4",
               "bundled": true,
               "dev": true,
               "optional": true
@@ -6762,7 +6746,7 @@
               }
             },
             "minimist": {
-              "version": "0.0.8",
+              "version": "1.2.5",
               "bundled": true,
               "dev": true,
               "optional": true
@@ -6787,12 +6771,12 @@
               }
             },
             "mkdirp": {
-              "version": "0.5.1",
+              "version": "0.5.3",
               "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
-                "minimist": "0.0.8"
+                "minimist": "^1.2.5"
               }
             },
             "ms": {
@@ -6802,7 +6786,7 @@
               "optional": true
             },
             "needle": {
-              "version": "2.4.0",
+              "version": "2.3.3",
               "bundled": true,
               "dev": true,
               "optional": true,
@@ -6831,7 +6815,7 @@
               }
             },
             "nopt": {
-              "version": "4.0.1",
+              "version": "4.0.3",
               "bundled": true,
               "dev": true,
               "optional": true,
@@ -6856,13 +6840,14 @@
               "optional": true
             },
             "npm-packlist": {
-              "version": "1.4.7",
+              "version": "1.4.8",
               "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
                 "ignore-walk": "^3.0.1",
-                "npm-bundled": "^1.0.1"
+                "npm-bundled": "^1.0.1",
+                "npm-normalize-package-bin": "^1.0.1"
               }
             },
             "npmlog": {
@@ -6942,18 +6927,10 @@
                 "ini": "~1.3.0",
                 "minimist": "^1.2.0",
                 "strip-json-comments": "~2.0.1"
-              },
-              "dependencies": {
-                "minimist": {
-                  "version": "1.2.0",
-                  "bundled": true,
-                  "dev": true,
-                  "optional": true
-                }
               }
             },
             "readable-stream": {
-              "version": "2.3.6",
+              "version": "2.3.7",
               "bundled": true,
               "dev": true,
               "optional": true,
@@ -7201,15 +7178,15 @@
       }
     },
     "webpack": {
-      "version": "4.41.6",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz",
-      "integrity": "sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==",
+      "version": "4.42.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz",
+      "integrity": "sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/wasm-edit": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
         "acorn": "^6.2.1",
         "ajv": "^6.10.2",
         "ajv-keywords": "^3.4.1",
@@ -7221,7 +7198,7 @@
         "loader-utils": "^1.2.3",
         "memory-fs": "^0.4.1",
         "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.1",
+        "mkdirp": "^0.5.3",
         "neo-async": "^2.6.1",
         "node-libs-browser": "^2.2.1",
         "schema-utils": "^1.0.0",
@@ -7346,6 +7323,21 @@
             "to-regex": "^3.0.2"
           }
         },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
+          "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "readable-stream": {
           "version": "2.3.7",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -7795,9 +7787,9 @@
       }
     },
     "yargs": {
-      "version": "13.3.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-      "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
       "dev": true,
       "requires": {
         "cliui": "^5.0.0",
@@ -7809,7 +7801,7 @@
         "string-width": "^3.0.0",
         "which-module": "^2.0.0",
         "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.1"
+        "yargs-parser": "^13.1.2"
       },
       "dependencies": {
         "ansi-regex": {
@@ -7818,6 +7810,12 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -7837,6 +7835,16 @@
           "requires": {
             "ansi-regex": "^4.1.0"
           }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index 455efb873..a09d406ce 100644
--- a/package.json
+++ b/package.json
@@ -434,7 +434,7 @@
   "devDependencies": {
     "@types/fs-extra": "^8.1.0",
     "@types/mocha": "^7.0.1",
-    "@types/node": "^13.7.6",
+    "@types/node": "^13.9.3",
     "@types/vscode": "^1.42.0",
     "@types/winreg": "^1.2.30",
     "@typescript-eslint/eslint-plugin": "^2.22.0",
@@ -446,12 +446,11 @@
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "mocha": "^7.1.0",
+    "mocha": "^7.1.1",
     "node-atomizr": "^0.6.1",
     "ts-loader": "^6.2.1",
-    "tslint": "^6.0.0",
     "typescript": "^3.8.2",
-    "webpack": "^4.41.6",
+    "webpack": "^4.42.1",
     "webpack-cli": "^3.3.11",
     "yamljs": "^0.3.0"
   },
@@ -461,10 +460,9 @@
     "datatables.net-bs4": "^1.10.20",
     "datatables.net-fixedheader-jqui": "^3.1.6",
     "fotorama": "^4.6.4",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^9.0.0",
     "jquery": "^3.4.1",
     "jquery.json-viewer": "^1.4.0",
-    "path": "^0.12.7",
     "popper.js": "^1.16.1",
     "winattr": "^3.0.0",
     "winreg": "^1.2.4"
diff --git a/webpack.config.js b/webpack.config.js
index bf93b0e7d..1e968b5b1 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,8 +2,8 @@
 
 'use strict';
 
-import { resolve as _resolve } from 'path';
-import CopyPlugin from 'copy-webpack-plugin';
+const path = require('path');
+const CopyPlugin = require('copy-webpack-plugin');
 
 /**@type {import('webpack').Configuration}*/
 const config = {
@@ -12,7 +12,7 @@ const config = {
   entry: './src/extension.ts', // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
   output: {
     // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
-    path: _resolve(__dirname, 'dist'),
+    path: path.resolve(__dirname, 'dist'),
     filename: 'extension.js',
     libraryTarget: 'commonjs2',
     devtoolModuleFilenameTemplate: '../[resource-path]'
@@ -57,4 +57,4 @@ const config = {
     ]),
   ],
 };
-export default config;
+module.exports = config
\ No newline at end of file

From e3023800e3ee883953503aa999bd7bc26ad4a9e2 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 25 Mar 2020 23:43:58 +0800
Subject: [PATCH 182/795] Use eslint in GitHub Actions

---
 .github/workflows/main.yml | 9 +++------
 package.json               | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 65a3654c3..e9a87ea6e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,17 +13,14 @@ jobs:
         with:
           name: vscode-R.vsix
           path: vscode-R.vsix
-  tslint:
+  eslint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Prepare
-        run: npm ci
       - name: Lint
-        uses: mooyoul/tslint-actions@v1.1.1
+        uses: stefanoeb/eslint-action@1.0.2
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          pattern: "src/*.ts"
+          files: src/
   lintr:
     runs-on: ubuntu-latest
     container:
diff --git a/package.json b/package.json
index a09d406ce..be70e13a7 100644
--- a/package.json
+++ b/package.json
@@ -443,6 +443,7 @@
     "eslint": "^6.8.0",
     "eslint-config-standard": "^14.1.0",
     "eslint-plugin-import": "^2.20.1",
+    "eslint-plugin-jsdoc": "^22.1.0",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",

From 499bc69053068fe77c235c1162b153f1b84dba7d Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 25 Mar 2020 23:46:58 +0800
Subject: [PATCH 183/795] Update package-lock.json

---
 package-lock.json | 50 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 4cf523b8f..9ace19a61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1203,6 +1203,12 @@
       "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
       "dev": true
     },
+    "comment-parser": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.2.tgz",
+      "integrity": "sha512-4Rjb1FnxtOcv9qsfuaNuVsmmVn4ooVoBHzYfyKteiXwIU84PClyGA5jASoFMwPV93+FPh9spwueXauxFJZkGAg==",
+      "dev": true
+    },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -2125,6 +2131,38 @@
         }
       }
     },
+    "eslint-plugin-jsdoc": {
+      "version": "22.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-22.1.0.tgz",
+      "integrity": "sha512-54NdbICM7KrxsGUqQsev9aIMqPXyvyBx2218Qcm0TQ16P9CtBI+YY4hayJR6adrxlq4Ej0JLpgfUXWaQVFqmQg==",
+      "dev": true,
+      "requires": {
+        "comment-parser": "^0.7.2",
+        "debug": "^4.1.1",
+        "jsdoctypeparser": "^6.1.0",
+        "lodash": "^4.17.15",
+        "regextras": "^0.7.0",
+        "semver": "^6.3.0",
+        "spdx-expression-parse": "^3.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
     "eslint-plugin-node": {
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz",
@@ -3680,6 +3718,12 @@
         "esprima": "^4.0.0"
       }
     },
+    "jsdoctypeparser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-6.1.0.tgz",
+      "integrity": "sha512-UCQBZ3xCUBv/PLfwKAJhp6jmGOSLFNKzrotXGNgbKhWvz27wPsCsVeP7gIcHPElQw2agBmynAitXqhxR58XAmA==",
+      "dev": true
+    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -5215,6 +5259,12 @@
       "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==",
       "dev": true
     },
+    "regextras": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.0.tgz",
+      "integrity": "sha512-ds+fL+Vhl918gbAUb0k2gVKbTZLsg84Re3DI6p85Et0U0tYME3hyW4nMK8Px4dtDaBA2qNjvG5uWyW7eK5gfmw==",
+      "dev": true
+    },
     "registry-auth-token": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",

From 3315d2777bebf719dd999c26ecd2e64e2bf6b5e2 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Wed, 25 Mar 2020 23:49:50 +0800
Subject: [PATCH 184/795] Fix main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e9a87ea6e..f44a92808 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Lint
         uses: stefanoeb/eslint-action@1.0.2
         with:
-          files: src/
+          files: src/*.ts
   lintr:
     runs-on: ubuntu-latest
     container:

From 74b96bf1a412170c918fbbda2a32b2b52a006921 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Sun, 29 Mar 2020 09:43:53 +0800
Subject: [PATCH 185/795] Make rebind also work in attached packages

---
 R/init.R | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/R/init.R b/R/init.R
index e6f7613e9..910e24486 100644
--- a/R/init.R
+++ b/R/init.R
@@ -217,10 +217,21 @@ if (interactive() && Sys.getenv("TERM_PROGRAM") == "vscode") {
         }
 
         rebind <- function(sym, value, ns) {
-          ns <- getNamespace(ns)
-          unlockBinding(sym, ns)
-          on.exit(lockBinding(sym, ns))
-          assign(sym, value, envir = ns)
+          if (is.character(ns)) {
+            Recall(sym, value, getNamespace(ns))
+            pkg <- paste0("package:", ns)
+            if (pkg %in% search()) {
+              Recall(sym, value, as.environment(pkg))
+            }
+          } else if (is.environment(ns)) {
+            if (bindingIsLocked(sym, ns)) {
+              unlockBinding(sym, ns)
+              on.exit(lockBinding(sym, ns))
+            }
+            assign(sym, value, ns)
+          } else {
+            stop("ns must be a string or environment")
+          }
         }
 
         setHook("plot.new", new_plot, "replace")

From edf300032d64c808be885d281a42eaea578ad21d Mon Sep 17 00:00:00 2001
From: Andrew 
Date: Sat, 28 Mar 2020 12:49:43 +0900
Subject: [PATCH 186/795] Add languages embedded in markdown

The new lines in package.json are copied from
https://github.com/microsoft/vscode/blob/master/extensions/markdown-basics/package.json
which is MIT-licensed. The license information is included in
ThirdPartyNotices.txt. License information cannot be added to
package.json because JSON does not allow comments.
---
 ThirdPartyNotices.txt | 33 +++++++++++++++++++++++++++++++
 package.json          | 45 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 ThirdPartyNotices.txt

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
new file mode 100644
index 000000000..a81c7684a
--- /dev/null
+++ b/ThirdPartyNotices.txt
@@ -0,0 +1,33 @@
+THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
+
+This project incorporates components from the projects listed below. The original copyright notices and the licenses under which Yuki Ueda received such components are set forth below. Yuki Ueda reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise.
+
+1. microsoft/vscode 1.43 (https://github.com/microsoft/vscode)
+
+%% microsoft/vscode NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2015 - present Microsoft Corporation
+
+All rights reserved.
+
+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 microsoft/vscode NOTICES AND INFORMATION
diff --git a/package.json b/package.json
index a09d406ce..609ebea69 100644
--- a/package.json
+++ b/package.json
@@ -117,7 +117,50 @@
         "scopeName": "text.html.rmarkdown",
         "path": "./syntax/RMarkdown.json",
         "embeddedLanguages": {
-          "text.html.rmarkdown": "markdown"
+          "text.html.rmarkdown": "markdown",
+          "meta.embedded.block.html": "html",
+          "source.js": "javascript",
+          "source.css": "css",
+          "meta.embedded.block.frontmatter": "yaml",
+          "meta.embedded.block.css": "css",
+          "meta.embedded.block.ini": "ini",
+          "meta.embedded.block.java": "java",
+          "meta.embedded.block.lua": "lua",
+          "meta.embedded.block.makefile": "makefile",
+          "meta.embedded.block.perl": "perl",
+          "meta.embedded.block.r": "r",
+          "meta.embedded.block.ruby": "ruby",
+          "meta.embedded.block.php": "php",
+          "meta.embedded.block.sql": "sql",
+          "meta.embedded.block.vs_net": "vs_net",
+          "meta.embedded.block.xml": "xml",
+          "meta.embedded.block.xsl": "xsl",
+          "meta.embedded.block.yaml": "yaml",
+          "meta.embedded.block.dosbatch": "dosbatch",
+          "meta.embedded.block.clojure": "clojure",
+          "meta.embedded.block.coffee": "coffee",
+          "meta.embedded.block.c": "c",
+          "meta.embedded.block.cpp": "cpp",
+          "meta.embedded.block.diff": "diff",
+          "meta.embedded.block.dockerfile": "dockerfile",
+          "meta.embedded.block.go": "go",
+          "meta.embedded.block.groovy": "groovy",
+          "meta.embedded.block.pug": "jade",
+          "meta.embedded.block.javascript": "javascript",
+          "meta.embedded.block.json": "json",
+          "meta.embedded.block.less": "less",
+          "meta.embedded.block.objc": "objc",
+          "meta.embedded.block.scss": "scss",
+          "meta.embedded.block.perl6": "perl6",
+          "meta.embedded.block.powershell": "powershell",
+          "meta.embedded.block.python": "python",
+          "meta.embedded.block.rust": "rust",
+          "meta.embedded.block.scala": "scala",
+          "meta.embedded.block.shellscript": "shellscript",
+          "meta.embedded.block.typescript": "typescript",
+          "meta.embedded.block.typescriptreact": "typescriptreact",
+          "meta.embedded.block.csharp": "csharp",
+          "meta.embedded.block.fsharp": "fsharp"
         }
       },
       {

From 26d13bf3cbfcdca0dc4ae0a78a41df06d6e8c265 Mon Sep 17 00:00:00 2001
From: Andrew 
Date: Sat, 28 Mar 2020 13:09:59 +0900
Subject: [PATCH 187/795] Add surround support for R Markdown files

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 609ebea69..c2c2ff0aa 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,8 @@
         "aliases": [
           "R Markdown",
           "r markdown"
-        ]
+        ],
+        "configuration": "./rd-configuration.json"
       }
     ],
     "snippets": [

From 3956d8623b2482f931eafdcbd64e30c8e4fbd1fa Mon Sep 17 00:00:00 2001
From: Andrew 
Date: Sat, 28 Mar 2020 13:12:20 +0900
Subject: [PATCH 188/795] Add backtick support for R documentation files

---
 rd-configuration.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rd-configuration.json b/rd-configuration.json
index b69211ee6..0910d1ef9 100644
--- a/rd-configuration.json
+++ b/rd-configuration.json
@@ -12,7 +12,8 @@
 		["[", "]"],
 		["(", ")"],
 		["\"", "\""],
-		["'", "'"]
+		["'", "'"],
+		["`", "`"]
 	],
 	"surroundingPairs": [
 		["{", "}"],
@@ -20,6 +21,7 @@
 		["(", ")"],
 		["\"", "\""],
 		["'", "'"],
+		["`", "`"],
 		["$", "$"]
 	]
 }
\ No newline at end of file

From 1f2c03f230cffd0c80cde75f75f307baf4412034 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 31 Mar 2020 08:39:52 +0800
Subject: [PATCH 189/795] Use setup-node

---
 .github/workflows/main.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f44a92808..775f81dc9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,10 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Lint
-        uses: stefanoeb/eslint-action@1.0.2
+      - uses: actions/setup-node@v1
         with:
-          files: src/*.ts
+          node-version: "13.x"
+      - run: npm ci
+      - run: eslint -c ./.eslintrc.js src/*.ts
   lintr:
     runs-on: ubuntu-latest
     container:

From d99e2b0bfaf5b02e0350293b73aae1b02cb19b5f Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 31 Mar 2020 08:42:12 +0800
Subject: [PATCH 190/795] Fix eslint

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 775f81dc9..60f654041 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,8 @@ jobs:
         with:
           node-version: "13.x"
       - run: npm ci
-      - run: eslint -c ./.eslintrc.js src/*.ts
+      - name: Run eslint
+        run: ./node_modules/.bin/eslint -c ./.eslintrc.js src/*.ts
   lintr:
     runs-on: ubuntu-latest
     container:

From 0230c91e95b6697387d9f03de47cff42602af8d8 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 31 Mar 2020 15:37:56 +0800
Subject: [PATCH 191/795] Make plot update more smart using magic null dev size

---
 R/init.R | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/R/init.R b/R/init.R
index e6f7613e9..375bad352 100644
--- a/R/init.R
+++ b/R/init.R
@@ -18,17 +18,25 @@ if (interactive() && Sys.getenv("TERM_PROGRAM") == "vscode") {
         plot_file <- file.path(dir_session, "plot.png")
         plot_history_file <- NULL
         plot_updated <- FALSE
+        null_dev_id <- c(pdf = 2L)
+        null_dev_size <- c(7 + pi, 7 + pi)
+
+        check_null_dev <- function() {
+          identical(dev.cur(), null_dev_id) && identical(dev.size(), null_dev_size)
+        }
 
         new_plot <- function() {
-          plot_history_file <<- file.path(dir_plot_history,
-            format(Sys.time(), "%Y%m%d-%H%M%OS6.png"))
-          plot_updated <<- TRUE
+          if (check_null_dev()) {
+            plot_history_file <<- file.path(dir_plot_history,
+              format(Sys.time(), "%Y%m%d-%H%M%OS6.png"))
+            plot_updated <<- TRUE
+          }
         }
 
         options(
           vscodeR = environment(),
           device = function(...) {
-            pdf(NULL, bg = "white")
+            pdf(NULL, width = null_dev_size[[1L]], height = null_dev_size[[2L]], bg = "white")
             dev.control(displaylist = "enable")
           },
           browser = function(url, ...) respond("browser", url = url, ...),
@@ -68,10 +76,10 @@ if (interactive() && Sys.getenv("TERM_PROGRAM") == "vscode") {
               info
             }, all.names = FALSE, USE.NAMES = TRUE)
             jsonlite::write_json(objs, globalenv_file, pretty = FALSE)
-            if (plot_updated && dev.cur() == 2L) {
+            if (check_null_dev() && plot_updated) {
               plot_updated <<- FALSE
               record <- recordPlot()
-              if (length(record[[1]])) {
+              if (length(record[[1L]])) {
                 dev_args <- getOption("dev.args")
                 do.call(png, c(list(filename = plot_file), dev_args))
                 on.exit({
@@ -227,9 +235,11 @@ if (interactive() && Sys.getenv("TERM_PROGRAM") == "vscode") {
         setHook("grid.newpage", new_plot, "replace")
 
         rebind(".External.graphics", function(...) {
-          plot_updated <<- TRUE
-          .prim <- .Primitive(".External.graphics")
-          .prim(...)
+          out <- .Primitive(".External.graphics")(...)
+          if (check_null_dev()) {
+            plot_updated <<- TRUE
+          }
+          out
         }, "base")
         rebind("View", dataview, "utils")
 

From bda75e68ca68650f54ddc41bc8664e67419857d3 Mon Sep 17 00:00:00 2001
From: Kun Ren 
Date: Tue, 31 Mar 2020 15:48:48 +0800
Subject: [PATCH 192/795] Refine code

---
 R/init.R | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/R/init.R b/R/init.R
index 375bad352..dcde84e24 100644
--- a/R/init.R
+++ b/R/init.R
@@ -22,7 +22,8 @@ if (interactive() && Sys.getenv("TERM_PROGRAM") == "vscode") {
         null_dev_size <- c(7 + pi, 7 + pi)
 
         check_null_dev <- function() {
-          identical(dev.cur(), null_dev_id) && identical(dev.size(), null_dev_size)
+          identical(dev.cur(), null_dev_id) &&
+            identical(dev.size(), null_dev_size)
         }
 
         new_plot <- function() {
@@ -76,7 +77,7 @@ if (interactive() && Sys.getenv("TERM_PROGRAM") == "vscode") {
               info
             }, all.names = FALSE, USE.NAMES = TRUE)
             jsonlite::write_json(objs, globalenv_file, pretty = FALSE)
-            if (check_null_dev() && plot_updated) {
+            if (plot_updated && check_null_dev()) {
               plot_updated <<- FALSE
               record <- recordPlot()
               if (length(record[[1L]])) {

From 86afacefdad8679fb426407271a24b7a491c1b03 Mon Sep 17 00:00:00 2001
From: Andrew 
Date: Tue, 31 Mar 2020 18:08:39 +0900
Subject: [PATCH 193/795] Remove backtick auto-closing pair for R Markdown

---
 package.json           |  2 +-
 rmd-configuration.json | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 rmd-configuration.json

diff --git a/package.json b/package.json
index c2c2ff0aa..36272ab6b 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
           "R Markdown",
           "r markdown"
         ],
-        "configuration": "./rd-configuration.json"
+        "configuration": "./rmd-configuration.json"
       }
     ],
     "snippets": [
diff --git a/rmd-configuration.json b/rmd-configuration.json
new file mode 100644
index 000000000..f04ea1232
--- /dev/null
+++ b/rmd-configuration.json
@@ -0,0 +1,26 @@
+{
+	"comments": {
+		"lineComment": "#"
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"]
+	],
+	"autoClosingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["\"", "\""],
+		["'", "'"]
+	],
+	"surroundingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["\"", "\""],
+		["'", "'"],
+		["`", "`"],
+		["$", "$"]
+	]
+}
\ No newline at end of file

From 1b540cbe70c78fe89f6dd7efec2e5e0486523c1c Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Fri, 3 Apr 2020 13:17:48 +0900
Subject: [PATCH 194/795] fix vlunerability

---
 package-lock.json | 2210 +++++++++++++++++----------------------------
 package.json      |   16 +-
 2 files changed, 820 insertions(+), 1406 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9ace19a61..21f44514d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,14 +13,20 @@
         "@babel/highlight": "^7.8.3"
       }
     },
+    "@babel/helper-validator-identifier": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz",
+      "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==",
+      "dev": true
+    },
     "@babel/highlight": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
-      "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+      "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
       "dev": true,
       "requires": {
+        "@babel/helper-validator-identifier": "^7.9.0",
         "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
         "js-tokens": "^4.0.0"
       }
     },
@@ -58,9 +64,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "13.9.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz",
-      "integrity": "sha512-01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA==",
+      "version": "13.11.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.0.tgz",
+      "integrity": "sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==",
       "dev": true
     },
     "@types/vscode": {
@@ -76,77 +82,45 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "2.25.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.25.0.tgz",
-      "integrity": "sha512-W2YyMtjmlrOjtXc+FtTelVs9OhuR6OlYc4XKIslJ8PUJOqgYYAPRJhAqkYRQo3G4sjvG8jSodsNycEn4W2gHUw==",
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.26.0.tgz",
+      "integrity": "sha512-4yUnLv40bzfzsXcTAtZyTjbiGUXMrcIJcIMioI22tSOyAxpdXiZ4r7YQUU8Jj6XXrLz9d5aMHPQf5JFR7h27Nw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "2.25.0",
+        "@typescript-eslint/experimental-utils": "2.26.0",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.0.0",
         "tsutils": "^3.17.1"
-      },
-      "dependencies": {
-        "tsutils": {
-          "version": "3.17.1",
-          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
-          "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.8.1"
-          }
-        }
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "2.25.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.25.0.tgz",
-      "integrity": "sha512-0IZ4ZR5QkFYbaJk+8eJ2kYeA+1tzOE1sBjbwwtSV85oNWYUBep+EyhlZ7DLUCyhMUGuJpcCCFL0fDtYAP1zMZw==",
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz",
+      "integrity": "sha512-RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/typescript-estree": "2.25.0",
+        "@typescript-eslint/typescript-estree": "2.26.0",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-scope": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
-          "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "eslint-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
-          "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        }
       }
     },
     "@typescript-eslint/parser": {
-      "version": "2.25.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.25.0.tgz",
-      "integrity": "sha512-mccBLaBSpNVgp191CP5W+8U1crTyXsRziWliCqzj02kpxdjKMvFHGJbK33NroquH3zB/gZ8H511HEsJBa2fNEg==",
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.26.0.tgz",
+      "integrity": "sha512-+Xj5fucDtdKEVGSh9353wcnseMRkPpEAOY96EEenN7kJVrLqy/EVwtIh3mxcUz8lsFXW1mT5nN5vvEam/a5HiQ==",
       "dev": true,
       "requires": {
         "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "2.25.0",
-        "@typescript-eslint/typescript-estree": "2.25.0",
+        "@typescript-eslint/experimental-utils": "2.26.0",
+        "@typescript-eslint/typescript-estree": "2.26.0",
         "eslint-visitor-keys": "^1.1.0"
       }
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "2.25.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz",
-      "integrity": "sha512-VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg==",
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz",
+      "integrity": "sha512-3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
@@ -156,46 +130,6 @@
         "lodash": "^4.17.15",
         "semver": "^6.3.0",
         "tsutils": "^3.17.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "tsutils": {
-          "version": "3.17.1",
-          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
-          "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.8.1"
-          }
-        }
       }
     },
     "@webassemblyjs/ast": {
@@ -386,9 +320,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+      "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
       "dev": true
     },
     "acorn-jsx": {
@@ -398,12 +332,12 @@
       "dev": true
     },
     "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
+      "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^2.0.1",
+        "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
@@ -428,12 +362,45 @@
       "dev": true,
       "requires": {
         "string-width": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "ansi-colors": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
       "dev": true
     },
     "ansi-escapes": {
@@ -454,9 +421,9 @@
       }
     },
     "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "dev": true
     },
     "ansi-styles": {
@@ -485,9 +452,9 @@
       "dev": true
     },
     "argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
         "sprintf-js": "~1.0.2"
@@ -741,30 +708,41 @@
         "widest-line": "^2.0.0"
       },
       "dependencies": {
-        "chalk": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
@@ -880,14 +858,6 @@
         "base64-js": "^1.0.2",
         "ieee754": "^1.1.4",
         "isarray": "^1.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        }
       }
     },
     "buffer-from": {
@@ -909,9 +879,9 @@
       "dev": true
     },
     "cacache": {
-      "version": "12.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
-      "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
       "dev": true,
       "requires": {
         "bluebird": "^3.5.5",
@@ -929,37 +899,6 @@
         "ssri": "^6.0.1",
         "unique-filename": "^1.1.1",
         "y18n": "^4.0.0"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
-        }
       }
     },
     "cache-base": {
@@ -986,15 +925,15 @@
       "dev": true
     },
     "camelcase": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-      "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
     "capture-stack-trace": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
-      "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
+      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
       "dev": true
     },
     "chalk": {
@@ -1006,17 +945,6 @@
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
         "supports-color": "^5.3.0"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "chardet": {
@@ -1053,9 +981,9 @@
       }
     },
     "chownr": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
-      "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
       "dev": true
     },
     "chrome-trace-event": {
@@ -1068,9 +996,9 @@
       }
     },
     "ci-info": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz",
-      "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
       "dev": true
     },
     "cipher-base": {
@@ -1138,10 +1066,16 @@
         "wrap-ansi": "^5.1.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
         "string-width": {
@@ -1154,15 +1088,6 @@
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^5.1.0"
           }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
         }
       }
     },
@@ -1183,12 +1108,12 @@
       }
     },
     "color-convert": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "requires": {
-        "color-name": "^1.1.1"
+        "color-name": "1.1.3"
       }
     },
     "color-name": {
@@ -1198,9 +1123,9 @@
       "dev": true
     },
     "commander": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
     "comment-parser": {
@@ -1237,38 +1162,6 @@
         "inherits": "^2.0.3",
         "readable-stream": "^2.2.2",
         "typedarray": "^0.0.6"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "configstore": {
@@ -1285,10 +1178,19 @@
         "xdg-basedir": "^3.0.0"
       },
       "dependencies": {
-        "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+        "make-dir": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
           "dev": true
         }
       }
@@ -1349,17 +1251,6 @@
         "schema-utils": "^1.0.0",
         "serialize-javascript": "^2.1.2",
         "webpack-log": "^2.0.0"
-      },
-      "dependencies": {
-        "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        }
       }
     },
     "core-util-is": {
@@ -1415,14 +1306,24 @@
       }
     },
     "cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "dev": true,
       "requires": {
-        "lru-cache": "^4.0.1",
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
         "shebang-command": "^1.2.0",
         "which": "^1.2.9"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "crypto-browserify": {
@@ -1451,9 +1352,9 @@
       "dev": true
     },
     "cson-parser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-2.0.0.tgz",
-      "integrity": "sha1-Y2ch4yK5fAKOj9GK/1iYwAIMKk0=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-2.0.1.tgz",
+      "integrity": "sha512-06Z/arU/l0SMC2UGEGZ7TIz8JLw9fvgD0ItI3tmoNH23Sxt5y9lEdXRN0oaeuXqQV+NBYh4JpsEuNIMxZfMVqA==",
       "dev": true,
       "requires": {
         "coffee-script": "^1.10.0"
@@ -1511,9 +1412,9 @@
       }
     },
     "debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
       "dev": true,
       "requires": {
         "ms": "^2.1.1"
@@ -1532,9 +1433,9 @@
       "dev": true
     },
     "deep-extend": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz",
-      "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
       "dev": true
     },
     "deep-is": {
@@ -1675,38 +1576,6 @@
         "inherits": "^2.0.1",
         "readable-stream": "^2.0.0",
         "stream-shift": "^1.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "elliptic": {
@@ -1725,21 +1594,21 @@
       }
     },
     "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
     "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true
     },
     "end-of-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dev": true,
       "requires": {
         "once": "^1.4.0"
@@ -1766,18 +1635,18 @@
       }
     },
     "error-ex": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
       "requires": {
         "is-arrayish": "^0.2.1"
       }
     },
     "es-abstract": {
-      "version": "1.17.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-      "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+      "version": "1.17.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+      "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
       "dev": true,
       "requires": {
         "es-to-primitive": "^1.2.1",
@@ -1855,59 +1724,22 @@
         "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+        "eslint-utils": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+          "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          },
-          "dependencies": {
-            "semver": {
-              "version": "5.7.1",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-              "dev": true
-            }
+            "eslint-visitor-keys": "^1.1.0"
           }
         },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "glob-parent": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "eslint-scope": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
-          "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "glob-parent": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
+            "is-glob": "^4.0.1"
           }
         },
         "ignore": {
@@ -1921,27 +1753,6 @@
           "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
           "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
           "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
-          "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
-          "dev": true
         }
       }
     },
@@ -1979,9 +1790,9 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz",
-      "integrity": "sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
+      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
       "dev": true,
       "requires": {
         "debug": "^2.6.9",
@@ -2065,23 +1876,12 @@
       "requires": {
         "eslint-utils": "^2.0.0",
         "regexpp": "^3.0.0"
-      },
-      "dependencies": {
-        "eslint-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
-          "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        }
       }
     },
     "eslint-plugin-import": {
-      "version": "2.20.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz",
-      "integrity": "sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==",
+      "version": "2.20.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz",
+      "integrity": "sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==",
       "dev": true,
       "requires": {
         "array-includes": "^3.0.3",
@@ -2117,12 +1917,6 @@
             "isarray": "^1.0.0"
           }
         },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -2144,29 +1938,12 @@
         "regextras": "^0.7.0",
         "semver": "^6.3.0",
         "spdx-expression-parse": "^3.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
       }
     },
     "eslint-plugin-node": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz",
-      "integrity": "sha512-chUs/NVID+sknFiJzxoN9lM7uKSOEta8GC8365hw1nDfwIPIjjpRSwwPvQanWv8dt/pDe9EV4anmVSwdiSndNg==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
+      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
       "dev": true,
       "requires": {
         "eslint-plugin-es": "^3.0.0",
@@ -2177,26 +1954,11 @@
         "semver": "^6.1.0"
       },
       "dependencies": {
-        "eslint-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
-          "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
         "ignore": {
           "version": "5.1.4",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
           "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
           "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
         }
       }
     },
@@ -2213,9 +1975,9 @@
       "dev": true
     },
     "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
+      "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -2223,9 +1985,9 @@
       }
     },
     "eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
+      "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
@@ -2238,22 +2000,14 @@
       "dev": true
     },
     "espree": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.0.tgz",
-      "integrity": "sha512-Xs8airJ7RQolnDIbLtRutmfvSsAe0xqMMAantCN/GMoqf81TFbeI1T7Jpd56qYu1uuh32dOG5W/X9uO+ghPXzA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
       "dev": true,
       "requires": {
-        "acorn": "^7.1.0",
+        "acorn": "^7.1.1",
         "acorn-jsx": "^5.2.0",
         "eslint-visitor-keys": "^1.1.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
-          "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
-          "dev": true
-        }
       }
     },
     "esprima": {
@@ -2263,12 +2017,20 @@
       "dev": true
     },
     "esquery": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz",
-      "integrity": "sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz",
+      "integrity": "sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.0.0"
+        "estraverse": "^5.0.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz",
+          "integrity": "sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A==",
+          "dev": true
+        }
       }
     },
     "esrecurse": {
@@ -2321,6 +2083,35 @@
         "p-finally": "^1.0.0",
         "signal-exit": "^3.0.0",
         "strip-eof": "^1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "dev": true
+        }
       }
     },
     "expand-brackets": {
@@ -2480,15 +2271,15 @@
       }
     },
     "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
       "dev": true
     },
     "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
     "fast-levenshtein": {
@@ -2498,9 +2289,9 @@
       "dev": true
     },
     "figgy-pudding": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
       "dev": true
     },
     "figures": {
@@ -2546,30 +2337,6 @@
         "commondir": "^1.0.1",
         "make-dir": "^2.0.0",
         "pkg-dir": "^3.0.0"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
       }
     },
     "find-up": {
@@ -2736,9 +2503,9 @@
       }
     },
     "flatted": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
       "dev": true
     },
     "flush-write-stream": {
@@ -2749,38 +2516,6 @@
       "requires": {
         "inherits": "^2.0.3",
         "readable-stream": "^2.3.6"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "for-in": {
@@ -2814,38 +2549,6 @@
       "requires": {
         "inherits": "^2.0.1",
         "readable-stream": "^2.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "fs-extra": {
@@ -2857,13 +2560,6 @@
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
         "universalify": "^1.0.0"
-      },
-      "dependencies": {
-        "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
-        }
       }
     },
     "fs-write-stream-atomic": {
@@ -2892,9 +2588,9 @@
       "optional": true
     },
     "fswin": {
-      "version": "3.18.918",
-      "resolved": "https://registry.npmjs.org/fswin/-/fswin-3.18.918.tgz",
-      "integrity": "sha512-9dwdStHWoL25DJiQ4jG/No9vBeKB+BVTLDuvXfNtVP5jf4j9zpBnje8gb5xpAqXN59wV7n8RSdDaGhhVzf7/ZA=="
+      "version": "3.19.908",
+      "resolved": "https://registry.npmjs.org/fswin/-/fswin-3.19.908.tgz",
+      "integrity": "sha512-xwq6wBg+KNuSjzQ3gZUOXt/FUhN9Wd+qQxz3yGM1xyTWu00ty82X+9Tc09z9XtMONYAhA8cCE3nolWoU7Rlz6g=="
     },
     "function-bind": {
       "version": "1.1.1",
@@ -2927,9 +2623,9 @@
       "dev": true
     },
     "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -2995,15 +2691,6 @@
             "kind-of": "^6.0.2",
             "which": "^1.3.1"
           }
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
         }
       }
     },
@@ -3021,9 +2708,9 @@
       }
     },
     "globals": {
-      "version": "12.3.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz",
-      "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==",
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
       "dev": true,
       "requires": {
         "type-fest": "^0.8.1"
@@ -3041,6 +2728,14 @@
         "ignore": "^3.3.5",
         "pify": "^3.0.0",
         "slash": "^1.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
       }
     },
     "got": {
@@ -3063,9 +2758,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.1.15",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
     },
     "growl": {
       "version": "1.10.5",
@@ -3245,14 +2940,6 @@
       "requires": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true
-        }
       }
     },
     "import-lazy": {
@@ -3294,9 +2981,9 @@
       }
     },
     "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
     "ini": {
@@ -3306,9 +2993,9 @@
       "dev": true
     },
     "inquirer": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.6.tgz",
-      "integrity": "sha512-7SVO4h+QIdMq6XcqIqrNte3gS5MzCCKZdsq9DO4PJziBFNYzP3PGFbDjgadDb//MCahzgjCxvQ/O2wa7kx9o4w==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
+      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
       "dev": true,
       "requires": {
         "ansi-escapes": "^4.2.1",
@@ -3326,12 +3013,6 @@
         "through": "^2.3.6"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -3367,35 +3048,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
         "strip-ansi": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -3482,12 +3140,12 @@
       "dev": true
     },
     "is-ci": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz",
-      "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
       "dev": true,
       "requires": {
-        "ci-info": "^1.0.0"
+        "ci-info": "^1.5.0"
       }
     },
     "is-data-descriptor": {
@@ -3554,9 +3212,9 @@
       "dev": true
     },
     "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true
     },
     "is-glob": {
@@ -3636,9 +3294,9 @@
       }
     },
     "is-retry-allowed": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
       "dev": true
     },
     "is-stream": {
@@ -3675,9 +3333,9 @@
       "dev": true
     },
     "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
       "dev": true
     },
     "isexe": {
@@ -3806,15 +3464,6 @@
         "strip-bom": "^3.0.0"
       },
       "dependencies": {
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -3830,13 +3479,13 @@
       "dev": true
     },
     "loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
       "dev": true,
       "requires": {
         "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
+        "emojis-list": "^3.0.0",
         "json5": "^1.0.1"
       }
     },
@@ -3872,22 +3521,30 @@
       "dev": true
     },
     "lru-cache": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz",
-      "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
       "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "yallist": "^3.0.2"
       }
     },
     "make-dir": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz",
-      "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "map-age-cleaner": {
@@ -3944,38 +3601,6 @@
       "requires": {
         "errno": "^0.1.3",
         "readable-stream": "^2.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "microee": {
@@ -4032,9 +3657,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "miniq": {
@@ -4063,48 +3688,6 @@
         "pumpify": "^1.3.3",
         "stream-each": "^1.1.0",
         "through2": "^2.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "through2": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~2.3.6",
-            "xtend": "~4.0.1"
-          }
-        }
       }
     },
     "mixin-deep": {
@@ -4129,20 +3712,12 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
+      "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
       "dev": true,
       "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
+        "minimist": "^1.2.5"
       }
     },
     "mm-brace-expand": {
@@ -4183,19 +3758,36 @@
         "yargs-unparser": "1.6.0"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+        "ansi-colors": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+          "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
           "dev": true
         },
-        "mkdirp": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "mkdirp": {
           "version": "0.5.3",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
           "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
@@ -4204,23 +3796,25 @@
             "minimist": "^1.2.5"
           }
         },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+          "dev": true
         },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+        "supports-color": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
+          "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
           "dev": true,
           "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -4240,9 +3834,9 @@
       }
     },
     "ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
     "mute-stream": {
@@ -4312,84 +3906,14 @@
         "xml-js": "^1.0.2"
       },
       "dependencies": {
-        "chalk": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-flag": {
+        "parse-json": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz",
+          "integrity": "sha1-+m9HsY4jgm6tMvJj50TQ4ehH+xM=",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "update-notifier": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
-          "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-          "dev": true,
-          "requires": {
-            "boxen": "^1.2.1",
-            "chalk": "^2.0.1",
-            "configstore": "^3.0.0",
-            "import-lazy": "^2.1.0",
-            "is-ci": "^1.0.10",
-            "is-installed-globally": "^0.1.0",
-            "is-npm": "^1.0.0",
-            "latest-version": "^3.0.0",
-            "semver-diff": "^2.0.0",
-            "xdg-basedir": "^3.0.0"
+            "error-ex": "^1.3.1"
           }
-        },
-        "uuid": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
-          "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==",
-          "dev": true
         }
       }
     },
@@ -4442,60 +3966,11 @@
         "vm-browserify": "^1.0.1"
       },
       "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
           "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          },
-          "dependencies": {
-            "string_decoder": {
-              "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-              "dev": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "string_decoder": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.2.0"
-          },
-          "dependencies": {
-            "safe-buffer": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-              "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
-              "dev": true
-            }
-          }
         }
       }
     },
@@ -4509,6 +3984,14 @@
         "resolve": "^1.10.0",
         "semver": "2 || 3 || 4 || 5",
         "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "normalize-path": {
@@ -4688,19 +4171,6 @@
         "mem": "^4.0.0"
       },
       "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
         "execa": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
@@ -4752,9 +4222,9 @@
       "dev": true
     },
     "p-limit": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-      "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+      "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
       "dev": true,
       "requires": {
         "p-try": "^2.0.0"
@@ -4785,6 +4255,14 @@
         "registry-auth-token": "^3.0.1",
         "registry-url": "^3.0.3",
         "semver": "^5.1.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "pako": {
@@ -4802,38 +4280,6 @@
         "cyclist": "^1.0.1",
         "inherits": "^2.0.3",
         "readable-stream": "^2.1.5"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "parent-module": {
@@ -4860,12 +4306,12 @@
       }
     },
     "parse-json": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz",
-      "integrity": "sha1-+m9HsY4jgm6tMvJj50TQ4ehH+xM=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "dev": true,
       "requires": {
-        "error-ex": "^1.3.1"
+        "error-ex": "^1.2.0"
       }
     },
     "parse-passwd": {
@@ -4929,6 +4375,14 @@
       "dev": true,
       "requires": {
         "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
       }
     },
     "pbkdf2": {
@@ -4951,9 +4405,9 @@
       "dev": true
     },
     "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true
     },
     "pkg-dir": {
@@ -5120,15 +4574,23 @@
       }
     },
     "rc": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz",
-      "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
       "requires": {
-        "deep-extend": "^0.5.1",
+        "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
         "minimist": "^1.2.0",
         "strip-json-comments": "~2.0.1"
+      },
+      "dependencies": {
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+          "dev": true
+        }
       }
     },
     "read-pkg": {
@@ -5215,23 +4677,18 @@
       }
     },
     "readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
       "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
       }
     },
     "readdirp": {
@@ -5266,9 +4723,9 @@
       "dev": true
     },
     "registry-auth-token": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+      "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
       "dev": true,
       "requires": {
         "rc": "^1.1.6",
@@ -5315,9 +4772,9 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
-      "integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
+      "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
       "dev": true,
       "requires": {
         "path-parse": "^1.0.6"
@@ -5330,6 +4787,14 @@
       "dev": true,
       "requires": {
         "resolve-from": "^3.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "dev": true
+        }
       }
     },
     "resolve-dir": {
@@ -5356,9 +4821,9 @@
       }
     },
     "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
     "resolve-url": {
@@ -5421,9 +4886,9 @@
       }
     },
     "rxjs": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
-      "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
+      "version": "6.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
+      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
@@ -5468,9 +4933,9 @@
       }
     },
     "semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true
     },
     "semver-diff": {
@@ -5480,6 +4945,14 @@
       "dev": true,
       "requires": {
         "semver": "^5.0.3"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "serialize-javascript": {
@@ -5549,9 +5022,9 @@
       "dev": true
     },
     "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
       "dev": true
     },
     "slash": {
@@ -5569,6 +5042,14 @@
         "ansi-styles": "^3.2.0",
         "astral-regex": "^1.0.0",
         "is-fullwidth-code-point": "^2.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        }
       }
     },
     "snapdragon": {
@@ -5833,38 +5314,6 @@
       "requires": {
         "inherits": "~2.0.1",
         "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "stream-each": {
@@ -5888,38 +5337,6 @@
         "readable-stream": "^2.3.6",
         "to-arraybuffer": "^1.0.0",
         "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "stream-shift": {
@@ -5929,48 +5346,93 @@
       "dev": true
     },
     "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        }
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz",
+      "integrity": "sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==",
       "dev": true,
       "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
       }
     },
     "string.prototype.trimleft": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
-      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
+      "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.17.5",
+        "string.prototype.trimstart": "^1.0.0"
       }
     },
     "string.prototype.trimright": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
-      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
+      "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.17.5",
+        "string.prototype.trimend": "^1.0.0"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz",
+      "integrity": "sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
       }
     },
     "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
     },
     "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^3.0.0"
+        "ansi-regex": "^4.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        }
       }
     },
     "strip-bom": {
@@ -5986,15 +5448,15 @@
       "dev": true
     },
     "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
+      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
       "dev": true
     },
     "supports-color": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
-      "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "requires": {
         "has-flag": "^3.0.0"
@@ -6012,10 +5474,16 @@
         "string-width": "^3.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
         "string-width": {
@@ -6025,17 +5493,8 @@
           "dev": true,
           "requires": {
             "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         }
       }
@@ -6056,9 +5515,9 @@
       }
     },
     "terser": {
-      "version": "4.6.7",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz",
-      "integrity": "sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==",
+      "version": "4.6.10",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.10.tgz",
+      "integrity": "sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -6066,12 +5525,6 @@
         "source-map-support": "~0.5.12"
       },
       "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -6118,13 +5571,13 @@
       "dev": true
     },
     "through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "dev": true,
       "requires": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
     "timed-out": {
@@ -6215,22 +5668,23 @@
         "loader-utils": "^1.0.2",
         "micromatch": "^4.0.0",
         "semver": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
       }
     },
     "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
       "dev": true
     },
+    "tsutils": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
+      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -6345,12 +5799,6 @@
           "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
           "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
           "dev": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
         }
       }
     },
@@ -6366,6 +5814,24 @@
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
       "dev": true
     },
+    "update-notifier": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+      "dev": true,
+      "requires": {
+        "boxen": "^1.2.1",
+        "chalk": "^2.0.1",
+        "configstore": "^3.0.0",
+        "import-lazy": "^2.1.0",
+        "is-ci": "^1.0.10",
+        "is-installed-globally": "^0.1.0",
+        "is-npm": "^1.0.0",
+        "latest-version": "^3.0.0",
+        "semver-diff": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
+      }
+    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -6421,6 +5887,14 @@
       "dev": true,
       "requires": {
         "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
       }
     },
     "util-deprecate": {
@@ -6430,15 +5904,15 @@
       "dev": true
     },
     "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "dev": true
     },
     "v8-compile-cache": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
-      "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
+      "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
       "dev": true
     },
     "validate-npm-package-license": {
@@ -6458,12 +5932,12 @@
       "dev": true
     },
     "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
+      "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
+        "chokidar": "^2.1.8",
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0"
       },
@@ -7153,12 +6627,6 @@
             }
           }
         },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -7180,21 +6648,6 @@
             "to-regex": "^3.0.2"
           }
         },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
         "readdirp": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -7206,15 +6659,6 @@
             "readable-stream": "^2.0.2"
           }
         },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
@@ -7258,6 +6702,12 @@
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
+        "acorn": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+          "dev": true
+        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -7287,6 +6737,16 @@
             }
           }
         },
+        "eslint-scope": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+          "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
+          }
+        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -7336,12 +6796,6 @@
             }
           }
         },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
         "memory-fs": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -7373,45 +6827,6 @@
             "to-regex": "^3.0.2"
           }
         },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
-          "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
@@ -7443,24 +6858,17 @@
         "yargs": "13.2.4"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
           "dev": true
         },
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
+        "emojis-list": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+          "dev": true
         },
         "enhanced-resolve": {
           "version": "4.1.0",
@@ -7473,12 +6881,23 @@
             "tapable": "^1.0.0"
           }
         },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
+        "loader-utils": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^2.0.0",
+            "json5": "^1.0.1"
+          }
+        },
         "memory-fs": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -7489,21 +6908,6 @@
             "readable-stream": "^2.0.1"
           }
         },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -7515,24 +6919,6 @@
             "strip-ansi": "^5.1.0"
           }
         },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -7542,6 +6928,12 @@
             "has-flag": "^3.0.0"
           }
         },
+        "v8-compile-cache": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
+          "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==",
+          "dev": true
+        },
         "yargs": {
           "version": "13.2.4",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
@@ -7592,9 +6984,9 @@
       }
     },
     "which": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "requires": {
         "isexe": "^2.0.0"
@@ -7613,15 +7005,81 @@
       "dev": true,
       "requires": {
         "string-width": "^1.0.2 || 2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "widest-line": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz",
-      "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
+      "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
       "dev": true,
       "requires": {
         "string-width": "^2.1.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "wildglob": {
@@ -7638,13 +7096,38 @@
         "through2": "~0.6.5"
       },
       "dependencies": {
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "dev": true,
           "requires": {
-            "brace-expansion": "^1.1.7"
+            "readable-stream": ">=1.0.33-1 <1.1.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
           }
         }
       }
@@ -7688,10 +7171,16 @@
         "strip-ansi": "^5.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
         "string-width": {
@@ -7704,15 +7193,6 @@
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^5.1.0"
           }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
         }
       }
     },
@@ -7732,22 +7212,14 @@
       }
     },
     "write-file-atomic": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.11",
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.2"
-      },
-      "dependencies": {
-        "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-          "dev": true
-        }
       }
     },
     "xdg-basedir": {
@@ -7757,12 +7229,12 @@
       "dev": true
     },
     "xml-js": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.4.1.tgz",
-      "integrity": "sha1-s0/6zgxtiYBKrwoYKCGsHtCKAek=",
+      "version": "1.6.11",
+      "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
+      "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
       "dev": true,
       "requires": {
-        "sax": "^1.2.1"
+        "sax": "^1.2.4"
       }
     },
     "xmlbuilder": {
@@ -7772,15 +7244,15 @@
       "dev": true
     },
     "xmldom": {
-      "version": "0.1.27",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
+      "version": "0.1.31",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
+      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
       "dev": true
     },
     "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "dev": true
     },
     "y18n": {
@@ -7790,9 +7262,9 @@
       "dev": true
     },
     "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
       "dev": true
     },
     "yamljs": {
@@ -7803,37 +7275,6 @@
       "requires": {
         "argparse": "^1.0.7",
         "glob": "^7.0.5"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        }
       }
     },
     "yargs": {
@@ -7854,16 +7295,16 @@
         "yargs-parser": "^13.1.2"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
           "dev": true
         },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
         "string-width": {
@@ -7876,44 +7317,17 @@
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^5.1.0"
           }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
         }
       }
     },
     "yargs-parser": {
-      "version": "13.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-      "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
       "dev": true,
       "requires": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        }
       }
     },
     "yargs-unparser": {
diff --git a/package.json b/package.json
index be70e13a7..37443efde 100644
--- a/package.json
+++ b/package.json
@@ -433,15 +433,15 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^8.1.0",
-    "@types/mocha": "^7.0.1",
-    "@types/node": "^13.9.3",
-    "@types/vscode": "^1.42.0",
+    "@types/mocha": "^7.0.2",
+    "@types/node": "^13.11.0",
+    "@types/vscode": "^1.43.0",
     "@types/winreg": "^1.2.30",
-    "@typescript-eslint/eslint-plugin": "^2.22.0",
-    "@typescript-eslint/parser": "^2.22.0",
+    "@typescript-eslint/eslint-plugin": "^2.26.0",
+    "@typescript-eslint/parser": "^2.26.0",
     "copy-webpack-plugin": "^5.1.1",
     "eslint": "^6.8.0",
-    "eslint-config-standard": "^14.1.0",
+    "eslint-config-standard": "^14.1.1",
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-jsdoc": "^22.1.0",
     "eslint-plugin-node": "^11.0.0",
@@ -449,8 +449,8 @@
     "eslint-plugin-standard": "^4.0.1",
     "mocha": "^7.1.1",
     "node-atomizr": "^0.6.1",
-    "ts-loader": "^6.2.1",
-    "typescript": "^3.8.2",
+    "ts-loader": "^6.2.2",
+    "typescript": "^3.8.3",
     "webpack": "^4.42.1",
     "webpack-cli": "^3.3.11",
     "yamljs": "^0.3.0"

From 52431462347492433e3b5174fb559962459734be Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Fri, 3 Apr 2020 13:22:46 +0900
Subject: [PATCH 195/795] fix vscode version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 37443efde..851671078 100644
--- a/package.json
+++ b/package.json
@@ -435,7 +435,7 @@
     "@types/fs-extra": "^8.1.0",
     "@types/mocha": "^7.0.2",
     "@types/node": "^13.11.0",
-    "@types/vscode": "^1.43.0",
+    "@types/vscode": "^1.42.0",
     "@types/winreg": "^1.2.30",
     "@typescript-eslint/eslint-plugin": "^2.26.0",
     "@typescript-eslint/parser": "^2.26.0",

From f2e26f6f453312fe30f8c901fe52735ce10f68c9 Mon Sep 17 00:00:00 2001
From: Yuki Ueda 
Date: Thu, 9 Apr 2020 12:57:19 +0900
Subject: [PATCH 196/795] update eslint rules

---
 .eslintrc.js      |  50 ++++++++------
 package-lock.json |   6 --
 package.json      |   3 +-
 src/extension.ts  | 162 +++++++++++++++++++++++-----------------------
 src/lineCache.ts  |   4 +-
 src/preview.ts    |  50 +++++++-------
 src/rGitignore.ts |  42 ++++++------
 src/rTerminal.ts  |  54 ++++++++--------
 src/selection.ts  |  24 +++----
 src/session.ts    | 162 +++++++++++++++++++++++-----------------------
 src/util.ts       |  52 +++++++--------
 src/viewer.ts     |   8 +--
 tsconfig.json     |  16 -----
 13 files changed, 309 insertions(+), 324 deletions(-)
 delete mode 100644 tsconfig.json

diff --git a/.eslintrc.js b/.eslintrc.js
index acf5a24fb..3cddffd8b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,22 +1,30 @@
 module.exports = {
-    env: {
-      browser: true,
-      es6: true
-    },
-    globals: {
-      Atomics: 'readonly',
-      SharedArrayBuffer: 'readonly'
-    },
-    parser: '@typescript-eslint/parser',
-    parserOptions: {
-      ecmaVersion: 2018,
-      sourceType: 'module'
-    },
-    plugins: [
-      '@typescript-eslint',
-      'jsdoc'
-    ],
-    rules: {
-    }
-  }
-  
\ No newline at end of file
+  env: {
+    browser: true,
+    es6: true,
+    node: true
+  },
+  extends: [
+    "plugin:@typescript-eslint/eslint-recommended"
+  ],
+  globals: {
+    Atomics: 'readonly',
+    SharedArrayBuffer: 'readonly'
+  },
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module'
+  },
+  plugins: [
+    '@typescript-eslint',
+    "jsdoc"
+  ],
+  rules: {
+		"semi": "error",
+		"no-extra-semi": "warn",
+		"curly": "warn",
+		"quotes": ["error", "single", { "allowTemplateLiterals": true } ],
+		"eqeqeq": "error"
+	}
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 21f44514d..7e4e0715f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1968,12 +1968,6 @@
       "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==",
       "dev": true
     },
-    "eslint-plugin-standard": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz",
-      "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==",
-      "dev": true
-    },
     "eslint-scope": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
diff --git a/package.json b/package.json
index de67b8560..5f166b55d 100644
--- a/package.json
+++ b/package.json
@@ -486,11 +486,10 @@
     "copy-webpack-plugin": "^5.1.1",
     "eslint": "^6.8.0",
     "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.20.1",
+    "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-jsdoc": "^22.1.0",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
     "mocha": "^7.1.1",
     "node-atomizr": "^0.6.1",
     "ts-loader": "^6.2.2",
diff --git a/src/extension.ts b/src/extension.ts
index 84b1d5e6b..53e48aa11 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -1,31 +1,31 @@
-"use strict";
+'use strict';
 // The module 'vscode' contains the VS Code extensibility API
 // Import the module and reference it with the alias vscode in your code below
 import { CancellationToken, commands, CompletionContext, CompletionItem, CompletionItemKind,
          ExtensionContext, Hover, IndentAction, languages, MarkdownString, Position, Range,
-         StatusBarAlignment, TextDocument, window } from "vscode";
+         StatusBarAlignment, TextDocument, window } from 'vscode';
 
-import { previewDataframe, previewEnvironment } from "./preview";
-import { createGitignore } from "./rGitignore";
+import { previewDataframe, previewEnvironment } from './preview';
+import { createGitignore } from './rGitignore';
 import { chooseTerminal, chooseTerminalAndSendText, createRTerm, deleteTerminal,
-         runSelectionInTerm, runTextInTerm } from "./rTerminal";
-import { getWordOrSelection, surroundSelection } from "./selection";
-import { attachActive, deploySessionWatcher, globalenv, showPlotHistory, startResponseWatcher } from "./session";
-import { config, ToRStringLiteral } from "./util";
+         runSelectionInTerm, runTextInTerm } from './rTerminal';
+import { getWordOrSelection, surroundSelection } from './selection';
+import { attachActive, deploySessionWatcher, globalenv, showPlotHistory, startResponseWatcher } from './session';
+import { config, ToRStringLiteral } from './util';
 
 const wordPattern = /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\<\>\/\s]+)/g;
 
 // Get with names(roxygen2:::default_tags())
 const roxygenTagCompletionItems = [
-    "export", "exportClass", "exportMethod", "exportPattern", "import", "importClassesFrom",
-    "importFrom", "importMethodsFrom", "rawNamespace", "S3method", "useDynLib", "aliases",
-    "author", "backref", "concept", "describeIn", "description", "details",
-    "docType", "encoding", "evalRd", "example", "examples", "family",
-    "field", "format", "inherit", "inheritParams", "inheritDotParams", "inheritSection",
-    "keywords", "method", "name", "md", "noMd", "noRd",
-    "note", "param", "rdname", "rawRd", "references", "return",
-    "section", "seealso", "slot", "source", "template", "templateVar",
-    "title", "usage"].map((x: string) => new CompletionItem(`${x} `));
+    'export', 'exportClass', 'exportMethod', 'exportPattern', 'import', 'importClassesFrom',
+    'importFrom', 'importMethodsFrom', 'rawNamespace', 'S3method', 'useDynLib', 'aliases',
+    'author', 'backref', 'concept', 'describeIn', 'description', 'details',
+    'docType', 'encoding', 'evalRd', 'example', 'examples', 'family',
+    'field', 'format', 'inherit', 'inheritParams', 'inheritDotParams', 'inheritSection',
+    'keywords', 'method', 'name', 'md', 'noMd', 'noRd',
+    'note', 'param', 'rdname', 'rawRd', 'references', 'return',
+    'section', 'seealso', 'slot', 'source', 'template', 'templateVar',
+    'title', 'usage'].map((x: string) => new CompletionItem(`${x} `));
 
 // This method is called when your extension is activated
 // Your extension is activated the very first time the command is executed
@@ -39,14 +39,14 @@ export function activate(context: ExtensionContext) {
 
     async function saveDocument(document: TextDocument) {
         if (document.isUntitled) {
-            window.showErrorMessage("Document is unsaved. Please save and retry running R command.");
+            window.showErrorMessage('Document is unsaved. Please save and retry running R command.');
 
             return false;
         }
 
         const isSaved: boolean = document.isDirty ? (await document.save()) : true;
         if (!isSaved) {
-            window.showErrorMessage("Cannot run R command: document could not be saved.");
+            window.showErrorMessage('Cannot run R command: document could not be saved.');
 
             return false;
         }
@@ -59,11 +59,11 @@ export function activate(context: ExtensionContext) {
         const isSaved = await saveDocument(wad);
         if (isSaved) {
             let rPath: string = ToRStringLiteral(wad.fileName, '"');
-            let encodingParam = config.get("source.encoding");
+            let encodingParam = config.get('source.encoding');
             encodingParam = `encoding = "${encodingParam}"`;
-            rPath = [rPath, encodingParam].join(", ");
+            rPath = [rPath, encodingParam].join(', ');
             if (echo) {
-                rPath = [rPath, "echo = TRUE"].join(", ");
+                rPath = [rPath, 'echo = TRUE'].join(', ');
             }
             chooseTerminalAndSendText(`source(${rPath})`);
         }
@@ -74,11 +74,11 @@ export function activate(context: ExtensionContext) {
         const isSaved = await saveDocument(wad);
         if (isSaved) {
             let rPath = ToRStringLiteral(wad.fileName, '"');
-            let encodingParam = config.get("source.encoding");
+            let encodingParam = config.get('source.encoding');
             encodingParam = `encoding = "${encodingParam}"`;
-            rPath = [rPath, encodingParam].join(", ");
+            rPath = [rPath, encodingParam].join(', ');
             if (echo) {
-                rPath = [rPath, "echo = TRUE"].join(", ");
+                rPath = [rPath, 'echo = TRUE'].join(', ');
             }
             if (outputFormat === undefined) {
                 chooseTerminalAndSendText(`rmarkdown::render(${rPath})`);
@@ -116,7 +116,7 @@ export function activate(context: ExtensionContext) {
 
     async function runCommandWithSelectionOrWord(rCommand: string) {
         const text = getWordOrSelection()
-                    .join("\n");
+                    .join('\n');
         const callableTerminal = await chooseTerminal();
         const call = rCommand.replace(/\$\$/g, text);
         runTextInTerm(callableTerminal, [call]);
@@ -127,7 +127,7 @@ export function activate(context: ExtensionContext) {
         const isSaved = await saveDocument(wad);
         if (isSaved) {
             const callableTerminal = await chooseTerminal();
-            const rPath = ToRStringLiteral(wad.fileName, "");
+            const rPath = ToRStringLiteral(wad.fileName, '');
             const call = rCommand.replace(/\$\$/g, rPath);
             runTextInTerm(callableTerminal, [call]);
         }
@@ -138,59 +138,59 @@ export function activate(context: ExtensionContext) {
         runTextInTerm(callableTerminal, [rCommand]);
     }
 
-    languages.registerCompletionItemProvider("r", {
+    languages.registerCompletionItemProvider('r', {
         provideCompletionItems(document: TextDocument, position: Position) {
             if (document.lineAt(position).text
-                        .substr(0, 2) === "#'") {
+                        .substr(0, 2) === '#\'') {
                 return roxygenTagCompletionItems;
             }
 
             return undefined;
         },
-    },                                       "@"); // Trigger on '@'
+    },                                       '@'); // Trigger on '@'
 
-    languages.setLanguageConfiguration("r", {
+    languages.setLanguageConfiguration('r', {
         onEnterRules: [{ // Automatically continue roxygen comments: #'
-        action: { indentAction: IndentAction.None, appendText: "#' " },
+        action: { indentAction: IndentAction.None, appendText: '#\' ' },
         beforeText: /^#'.*/,
         }],
         wordPattern,
     });
 
     context.subscriptions.push(
-        commands.registerCommand("r.nrow", () => runSelectionOrWord(["nrow"])),
-        commands.registerCommand("r.length", () => runSelectionOrWord(["length"])),
-        commands.registerCommand("r.head", () => runSelectionOrWord(["head"])),
-        commands.registerCommand("r.thead", () => runSelectionOrWord(["t", "head"])),
-        commands.registerCommand("r.names", () => runSelectionOrWord(["names"])),
-        commands.registerCommand("r.runSource", () => { runSource(false); }),
-        commands.registerCommand("r.knitRmd", () => { knitRmd(false, undefined); }),
-        commands.registerCommand("r.knitRmdToPdf", () => { knitRmd(false, "pdf_document"); }),
-        commands.registerCommand("r.knitRmdToHtml", () => { knitRmd(false, "html_document"); }),
-        commands.registerCommand("r.knitRmdToAll", () => { knitRmd(false, "all"); }),
-        commands.registerCommand("r.createRTerm", createRTerm),
-        commands.registerCommand("r.runSourcewithEcho", () => { runSource(true); }),
-        commands.registerCommand("r.runSelection", runSelection),
-        commands.registerCommand("r.runSelectionInActiveTerm", runSelectionInActiveTerm),
-        commands.registerCommand("r.createGitignore", createGitignore),
-        commands.registerCommand("r.previewDataframe", previewDataframe),
-        commands.registerCommand("r.previewEnvironment", previewEnvironment),
-        commands.registerCommand("r.loadAll", () => chooseTerminalAndSendText("devtools::load_all()")),
-        commands.registerCommand("r.test", () => chooseTerminalAndSendText("devtools::test()")),
-        commands.registerCommand("r.install", () => chooseTerminalAndSendText("devtools::install()")),
-        commands.registerCommand("r.build", () => chooseTerminalAndSendText("devtools::build()")),
-        commands.registerCommand("r.document", () => chooseTerminalAndSendText("devtools::document()")),
-        commands.registerCommand("r.attachActive", attachActive),
-        commands.registerCommand("r.showPlotHistory", showPlotHistory),
-        commands.registerCommand("r.runCommandWithSelectionOrWord", runCommandWithSelectionOrWord),
-        commands.registerCommand("r.runCommandWithEditorPath", runCommandWithEditorPath),
-        commands.registerCommand("r.runCommand", runCommand),
+        commands.registerCommand('r.nrow', () => runSelectionOrWord(['nrow'])),
+        commands.registerCommand('r.length', () => runSelectionOrWord(['length'])),
+        commands.registerCommand('r.head', () => runSelectionOrWord(['head'])),
+        commands.registerCommand('r.thead', () => runSelectionOrWord(['t', 'head'])),
+        commands.registerCommand('r.names', () => runSelectionOrWord(['names'])),
+        commands.registerCommand('r.runSource', () => { runSource(false); }),
+        commands.registerCommand('r.knitRmd', () => { knitRmd(false, undefined); }),
+        commands.registerCommand('r.knitRmdToPdf', () => { knitRmd(false, 'pdf_document'); }),
+        commands.registerCommand('r.knitRmdToHtml', () => { knitRmd(false, 'html_document'); }),
+        commands.registerCommand('r.knitRmdToAll', () => { knitRmd(false, 'all'); }),
+        commands.registerCommand('r.createRTerm', createRTerm),
+        commands.registerCommand('r.runSourcewithEcho', () => { runSource(true); }),
+        commands.registerCommand('r.runSelection', runSelection),
+        commands.registerCommand('r.runSelectionInActiveTerm', runSelectionInActiveTerm),
+        commands.registerCommand('r.createGitignore', createGitignore),
+        commands.registerCommand('r.previewDataframe', previewDataframe),
+        commands.registerCommand('r.previewEnvironment', previewEnvironment),
+        commands.registerCommand('r.loadAll', () => chooseTerminalAndSendText('devtools::load_all()')),
+        commands.registerCommand('r.test', () => chooseTerminalAndSendText('devtools::test()')),
+        commands.registerCommand('r.install', () => chooseTerminalAndSendText('devtools::install()')),
+        commands.registerCommand('r.build', () => chooseTerminalAndSendText('devtools::build()')),
+        commands.registerCommand('r.document', () => chooseTerminalAndSendText('devtools::document()')),
+        commands.registerCommand('r.attachActive', attachActive),
+        commands.registerCommand('r.showPlotHistory', showPlotHistory),
+        commands.registerCommand('r.runCommandWithSelectionOrWord', runCommandWithSelectionOrWord),
+        commands.registerCommand('r.runCommandWithEditorPath', runCommandWithEditorPath),
+        commands.registerCommand('r.runCommand', runCommand),
         window.onDidCloseTerminal(deleteTerminal),
     );
 
-    if (config.get("sessionWatcher")) {
-        console.info("Initialize session watcher");
-        languages.registerHoverProvider("r", {
+    if (config.get('sessionWatcher')) {
+        console.info('Initialize session watcher');
+        languages.registerHoverProvider('r', {
             provideHover(document, position, token) {
                 const wordRange = document.getWordRangeAtPosition(position);
                 const text = document.getText(wordRange);
@@ -210,10 +210,10 @@ export function activate(context: ExtensionContext) {
                 const text = document.getText(range);
                 for (let i = text.length - 1; i >= 0; i -= 1) {
                     const chr = text.charAt(i);
-                    if (chr === "]") {
+                    if (chr === ']') {
                         expectOpenBrackets += 1;
                     // tslint:disable-next-line: triple-equals
-                    } else if (chr == "[") {
+                    } else if (chr === '[') {
                         if (expectOpenBrackets === 0) {
                             const symbolPosition = new Position(range.start.line, i - 1);
                             const symbolRange = document.getWordRangeAtPosition(symbolPosition);
@@ -234,10 +234,10 @@ export function activate(context: ExtensionContext) {
             if (!token.isCancellationRequested && symbol !== undefined) {
                 const obj = globalenv[symbol];
                 if (obj !== undefined && obj.names !== undefined) {
-                    const doc = new MarkdownString("Element of `" + symbol + "`");
+                    const doc = new MarkdownString('Element of `' + symbol + '`');
                     obj.names.map((name: string) => {
                         const item = new CompletionItem(name, CompletionItemKind.Field);
-                        item.detail = "[session]";
+                        item.detail = '[session]';
                         item.documentation = doc;
                         items.push(item);
                     });
@@ -245,7 +245,7 @@ export function activate(context: ExtensionContext) {
             }
         }
 
-        languages.registerCompletionItemProvider("r", {
+        languages.registerCompletionItemProvider('r', {
             provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken, completionContext: CompletionContext) {
                 const items = [];
                 if (token.isCancellationRequested) { return items; }
@@ -254,30 +254,30 @@ export function activate(context: ExtensionContext) {
                     Object.keys(globalenv).map((key) => {
                         const obj = globalenv[key];
                         const item = new CompletionItem(key,
-                                                        obj.type === "closure" || obj.type === "builtin" ?
+                                                        obj.type === 'closure' || obj.type === 'builtin' ?
                                 CompletionItemKind.Function :
                                 CompletionItemKind.Field);
-                        item.detail = "[session]";
-                        item.documentation = new MarkdownString("```r\n" + obj.str + "\n```");
+                        item.detail = '[session]';
+                        item.documentation = new MarkdownString('```r\n' + obj.str + '\n```');
                         items.push(item);
                     });
-                } else if (completionContext.triggerCharacter === "$" || completionContext.triggerCharacter === "@") {
+                } else if (completionContext.triggerCharacter === '$' || completionContext.triggerCharacter === '@') {
                     const symbolPosition = new Position(position.line, position.character - 1);
                     const symbolRange = document.getWordRangeAtPosition(symbolPosition);
                     const symbol = document.getText(symbolRange);
-                    const doc = new MarkdownString("Element of `" + symbol + "`");
+                    const doc = new MarkdownString('Element of `' + symbol + '`');
                     const obj = globalenv[symbol];
                     let elements: string[];
                     if (obj !== undefined) {
-                        if (completionContext.triggerCharacter === "$") {
+                        if (completionContext.triggerCharacter === '$') {
                             elements = obj.names;
-                        } else if (completionContext.triggerCharacter === "@") {
+                        } else if (completionContext.triggerCharacter === '@') {
                             elements = obj.slots;
                         }
                     }
                     elements.map((key) => {
                         const item = new CompletionItem(key, CompletionItemKind.Field);
-                        item.detail = "[session]";
+                        item.detail = '[session]';
                         item.documentation = doc;
                         items.push(item);
                     });
@@ -285,19 +285,19 @@ export function activate(context: ExtensionContext) {
 
                 if (completionContext.triggerCharacter === undefined ||
                     completionContext.triggerCharacter === '"' ||
-                    completionContext.triggerCharacter === "'") {
+                    completionContext.triggerCharacter === '\'') {
                     getBracketCompletionItems(document, position, token, items);
                 }
 
                 return items;
             },
-        },                                       "", "$", "@", '"', "'");
+        },                                       '', '$', '@', '"', '\'');
 
-        console.info("Create sessionStatusBarItem");
+        console.info('Create sessionStatusBarItem');
         const sessionStatusBarItem = window.createStatusBarItem(StatusBarAlignment.Right, 1000);
-        sessionStatusBarItem.command = "r.attachActive";
-        sessionStatusBarItem.text = "R: (not attached)";
-        sessionStatusBarItem.tooltip = "Attach Active Terminal";
+        sessionStatusBarItem.command = 'r.attachActive';
+        sessionStatusBarItem.text = 'R: (not attached)';
+        sessionStatusBarItem.tooltip = 'Attach Active Terminal';
         context.subscriptions.push(sessionStatusBarItem);
         sessionStatusBarItem.show();
 
diff --git a/src/lineCache.ts b/src/lineCache.ts
index 8dd550838..49618eb47 100644
--- a/src/lineCache.ts
+++ b/src/lineCache.ts
@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 /**
  * Class to hold lines that have been fetched from the document after they have been preprocessed.
@@ -41,7 +41,7 @@ export class LineCache {
 }
 
 function cleanLine(text: string) {
-    const cleaned = text.replace(/\s*\#.*/, "");
+    const cleaned = text.replace(/\s*\#.*/, '');
 
     return (cleaned);
 }
diff --git a/src/preview.ts b/src/preview.ts
index 0ded00b10..17da661f2 100644
--- a/src/preview.ts
+++ b/src/preview.ts
@@ -1,11 +1,11 @@
-"use strict";
+'use strict';
 
-import { existsSync, mkdirSync, removeSync, statSync } from "fs-extra";
-import { commands, extensions, window, workspace } from "vscode";
+import { existsSync, mkdirSync, removeSync, statSync } from 'fs-extra';
+import { commands, extensions, window, workspace } from 'vscode';
 
-import { chooseTerminalAndSendText } from "./rTerminal";
-import { getWordOrSelection } from "./selection";
-import { checkForSpecialCharacters, checkIfFileExists, delay } from "./util";
+import { chooseTerminalAndSendText } from './rTerminal';
+import { getWordOrSelection } from './selection';
+import { checkForSpecialCharacters, checkIfFileExists, delay } from './util';
 
 export async function previewEnvironment() {
     if (!checkcsv()) {
@@ -13,10 +13,10 @@ export async function previewEnvironment() {
     }
     const tmpDir = makeTmpDir();
     const pathToTmpCsv = `${tmpDir}/environment.csv`;
-    const envName = "name=ls()";
-    const envClass = "class=sapply(ls(), function(x) {class(get(x, envir = parent.env(environment())))[1]})";
-    const envOut = "out=sapply(ls(), function(x) {capture.output(str(get(x, envir = parent.env(environment()))), silent = T)[1]})";
-    const rWriteCsvCommand = "write.csv(data.frame("
+    const envName = 'name=ls()';
+    const envClass = 'class=sapply(ls(), function(x) {class(get(x, envir = parent.env(environment())))[1]})';
+    const envOut = 'out=sapply(ls(), function(x) {capture.output(str(get(x, envir = parent.env(environment()))), silent = T)[1]})';
+    const rWriteCsvCommand = 'write.csv(data.frame('
                              + `${envName},`
                              + `${envClass},`
                              + `${envOut}), '`
@@ -34,7 +34,7 @@ export async function previewDataframe() {
     const dataframeName = selectedTextArray[0];
 
     if (selectedTextArray.length !== 1 || !checkForSpecialCharacters(dataframeName)) {
-        window.showInformationMessage("This does not appear to be a dataframe.");
+        window.showInformationMessage('This does not appear to be a dataframe.');
 
         return false;
     }
@@ -53,7 +53,7 @@ async function openTmpCSV(pathToTmpCsv: string, tmpDir: string) {
     await delay(350); // Needed since file size has not yet changed
 
     if (!checkIfFileExists(pathToTmpCsv)) {
-        window.showErrorMessage("Dataframe failed to display.");
+        window.showErrorMessage('Dataframe failed to display.');
         removeSync(tmpDir);
 
         return false;
@@ -62,21 +62,21 @@ async function openTmpCSV(pathToTmpCsv: string, tmpDir: string) {
     // Async poll for R to complete writing CSV.
     const success = await waitForFileToFinish(pathToTmpCsv);
     if (!success) {
-        window.showWarningMessage("Visual Studio Code currently limits opening files to 20 MB.");
+        window.showWarningMessage('Visual Studio Code currently limits opening files to 20 MB.');
         removeSync(tmpDir);
 
         return false;
     }
 
-    if (process.platform === "win32") {
-        const winattr = require("winattr");
+    if (process.platform === 'win32') {
+        const winattr = require('winattr');
         winattr.setSync(tmpDir, {hidden: true});
     }
 
     // Open CSV in Excel Viewer and clean up.
     workspace.openTextDocument(pathToTmpCsv)
              .then(async (file) => {
-                await commands.executeCommand("csv.preview", file.uri);
+                await commands.executeCommand('csv.preview', file.uri);
                 removeSync(tmpDir);
             });
 }
@@ -106,11 +106,11 @@ async function waitForFileToFinish(filePath: string) {
 
 function makeTmpDir() {
     let tmpDir = workspace.workspaceFolders[0].uri.fsPath;
-    if (process.platform === "win32") {
-        tmpDir = tmpDir.replace(/\\/g, "/");
-        tmpDir += "/tmp";
+    if (process.platform === 'win32') {
+        tmpDir = tmpDir.replace(/\\/g, '/');
+        tmpDir += '/tmp';
     } else {
-        tmpDir += "/.tmp";
+        tmpDir += '/.tmp';
     }
     if (!existsSync(tmpDir)) {
         mkdirSync(tmpDir);
@@ -120,15 +120,15 @@ function makeTmpDir() {
 }
 
 function checkcsv() {
-    const iscsv = extensions.getExtension("GrapeCity.gc-excelviewer");
+    const iscsv = extensions.getExtension('GrapeCity.gc-excelviewer');
     if (iscsv !== undefined && iscsv.isActive) {
         return true;
     }
-    window.showInformationMessage("This function need to install `GrapeCity.gc-excelviewer`, will you install?",
-                                  "Yes", "No")
+    window.showInformationMessage('This function need to install `GrapeCity.gc-excelviewer`, will you install?',
+                                  'Yes', 'No')
           .then((select) => {
-        if (select === "Yes") {
-            commands.executeCommand("workbench.extensions.installExtension", "GrapeCity.gc-excelviewer");
+        if (select === 'Yes') {
+            commands.executeCommand('workbench.extensions.installExtension', 'GrapeCity.gc-excelviewer');
         }
     });
 
diff --git a/src/rGitignore.ts b/src/rGitignore.ts
index 6104b45b4..e0a7deff1 100644
--- a/src/rGitignore.ts
+++ b/src/rGitignore.ts
@@ -1,32 +1,32 @@
-"use strict";
+'use strict';
 
-import { writeFile } from "fs-extra";
-import { join } from "path";
-import {  window, workspace } from "vscode";
+import { writeFile } from 'fs-extra';
+import { join } from 'path';
+import {  window, workspace } from 'vscode';
 // From "https://github.com/github/gitignore/raw/master/R.gitignore"
-const ignoreFiles = [".Rhistory",
-                     ".Rapp.history",
-                     ".RData",
-                     "*-Ex.R",
-                     "/*.tar.gz",
-                     "/*.Rcheck/",
-                     ".Rproj.user/",
-                     "vignettes/*.html",
-                     "vignettes/*.pdf",
-                     ".httr-oauth",
-                     "/*_cache/",
-                     "/cache/",
-                     "*.utf8.md",
-                     "*.knit.md",
-                     "rsconnect/"].join("\n");
+const ignoreFiles = ['.Rhistory',
+                     '.Rapp.history',
+                     '.RData',
+                     '*-Ex.R',
+                     '/*.tar.gz',
+                     '/*.Rcheck/',
+                     '.Rproj.user/',
+                     'vignettes/*.html',
+                     'vignettes/*.pdf',
+                     '.httr-oauth',
+                     '/*_cache/',
+                     '/cache/',
+                     '*.utf8.md',
+                     '*.knit.md',
+                     'rsconnect/'].join('\n');
 
 export function createGitignore() {
     if (workspace.workspaceFolders[0].uri.path === undefined) {
-        window.showWarningMessage("Please open workspace to create .gitignore");
+        window.showWarningMessage('Please open workspace to create .gitignore');
 
         return;
     }
-    const ignorePath = join(workspace.workspaceFolders[0].uri.path, ".gitignore");
+    const ignorePath = join(workspace.workspaceFolders[0].uri.path, '.gitignore');
     writeFile(ignorePath, ignoreFiles, (err) => {
         try {
             if (err) {
diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index 41b3abd08..8cac6a6c5 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -1,25 +1,25 @@
-"use strict";
+'use strict';
 
-import os = require("os");
-import path = require("path");
+import os = require('os');
+import path = require('path');
 
-import { pathExists } from "fs-extra";
-import { isDeepStrictEqual } from "util";
-import { commands, Terminal, TerminalOptions, window } from "vscode";
+import { pathExists } from 'fs-extra';
+import { isDeepStrictEqual } from 'util';
+import { commands, Terminal, TerminalOptions, window } from 'vscode';
 
-import { getSelection } from "./selection";
-import { removeSessionFiles } from "./session";
-import { config, delay, getRpath } from "./util";
+import { getSelection } from './selection';
+import { removeSessionFiles } from './session';
+import { config, delay, getRpath } from './util';
 export let rTerm: Terminal;
 
 export async function createRTerm(preserveshow?: boolean): Promise {
-    const termName = "R Interactive";
+    const termName = 'R Interactive';
     const termPath = await getRpath();
     console.info(`termPath: ${termPath}`);
     if (termPath === undefined) {
         return undefined;
     }
-    const termOpt: string[] = config.get("rterm.option");
+    const termOpt: string[] = config.get('rterm.option');
     pathExists(termPath, (err, exists) => {
         if (exists) {
             const termOptions: TerminalOptions = {
@@ -27,10 +27,10 @@ export async function createRTerm(preserveshow?: boolean): Promise {
                 shellPath: termPath,
                 shellArgs: termOpt,
             };
-            if (config.get("sessionWatcher")) {
+            if (config.get('sessionWatcher')) {
                 termOptions.env = {
                     R_PROFILE_USER_OLD: process.env.R_PROFILE_USER,
-                    R_PROFILE_USER: path.join(os.homedir(), ".vscode-R", ".Rprofile"),
+                    R_PROFILE_USER: path.join(os.homedir(), '.vscode-R', '.Rprofile'),
                 };
             }
             rTerm = window.createTerminal(termOptions);
@@ -38,7 +38,7 @@ export async function createRTerm(preserveshow?: boolean): Promise {
 
             return true;
         }
-        window.showErrorMessage("Cannot find R client.  Please check R path in preferences and reload.");
+        window.showErrorMessage('Cannot find R client.  Please check R path in preferences and reload.');
 
         return false;
     });
@@ -46,7 +46,7 @@ export async function createRTerm(preserveshow?: boolean): Promise {
 
 export function deleteTerminal(term: Terminal) {
     if (isDeepStrictEqual(term, rTerm)) {
-        if (config.get("sessionWatcher")) {
+        if (config.get('sessionWatcher')) {
             removeSessionFiles();
         }
         rTerm = undefined;
@@ -54,9 +54,9 @@ export function deleteTerminal(term: Terminal) {
 }
 
 export async function chooseTerminal(active: boolean = false) {
-    if (active || config.get("alwaysUseActiveTerminal")) {
+    if (active || config.get('alwaysUseActiveTerminal')) {
         if (window.terminals.length < 1) {
-            window.showInformationMessage("There are no open terminals.");
+            window.showInformationMessage('There are no open terminals.');
 
             return undefined;
         }
@@ -65,7 +65,7 @@ export async function chooseTerminal(active: boolean = false) {
     }
 
     if (window.terminals.length > 0) {
-        const rTermNameOpinions = ["R", "R Interactive"];
+        const rTermNameOpinions = ['R', 'R Interactive'];
         if (window.activeTerminal !== undefined) {
             const activeTerminalName = window.activeTerminal.name;
             if (rTermNameOpinions.includes(activeTerminalName)) {
@@ -80,7 +80,7 @@ export async function chooseTerminal(active: boolean = false) {
                 }
             } else {
                 // tslint:disable-next-line: max-line-length
-                window.showInformationMessage("Error identifying terminal! This shouldn't happen, so please file an issue at https://github.com/Ikuyadeu/vscode-R/issues");
+                window.showInformationMessage('Error identifying terminal! This shouldn\'t happen, so please file an issue at https://github.com/Ikuyadeu/vscode-R/issues');
 
                 return undefined;
             }
@@ -101,20 +101,20 @@ export async function chooseTerminal(active: boolean = false) {
 export function runSelectionInTerm(term: Terminal) {
     const selection = getSelection();
     if (selection.linesDownToMoveCursor > 0) {
-        commands.executeCommand("cursorMove", { to: "down", value: selection.linesDownToMoveCursor });
-        commands.executeCommand("cursorMove", { to: "wrappedLineFirstNonWhitespaceCharacter" });
+        commands.executeCommand('cursorMove', { to: 'down', value: selection.linesDownToMoveCursor });
+        commands.executeCommand('cursorMove', { to: 'wrappedLineFirstNonWhitespaceCharacter' });
     }
     runTextInTerm(term, selection.selectedTextArray);
 }
 
 export async function runTextInTerm(term: Terminal, textArray: string[]) {
-    if (textArray.length > 1 && config.get("bracketedPaste")) {
-        if (process.platform !== "win32") {
+    if (textArray.length > 1 && config.get('bracketedPaste')) {
+        if (process.platform !== 'win32') {
             // Surround with ANSI control characters for bracketed paste mode
             textArray[0] = `\x1b[200~${textArray[0]}`;
-            textArray[textArray.length - 1] += "\x1b[201~";
+            textArray[textArray.length - 1] += '\x1b[201~';
         }
-        term.sendText(textArray.join("\n"));
+        term.sendText(textArray.join('\n'));
     } else {
         for (const line of textArray) {
             await delay(8); // Increase delay if RTerm can't handle speed.
@@ -134,6 +134,6 @@ export async function chooseTerminalAndSendText(text: string) {
 }
 
 function setFocus(term: Terminal) {
-    const focus: string = config.get("source.focus");
-    term.show(focus !== "terminal");
+    const focus: string = config.get('source.focus');
+    term.show(focus !== 'terminal');
 }
diff --git a/src/selection.ts b/src/selection.ts
index 60ed4a7a0..62a0316ff 100644
--- a/src/selection.ts
+++ b/src/selection.ts
@@ -1,8 +1,8 @@
-"use strict";
+'use strict';
 
-import { Position, Range, window } from "vscode";
+import { Position, Range, window } from 'vscode';
 
-import { LineCache } from "./lineCache";
+import { LineCache } from './lineCache';
 
 export function getWordOrSelection() {
     const selection = window.activeTextEditor.selection;
@@ -16,18 +16,18 @@ export function getWordOrSelection() {
         text = currentDocument.getText(window.activeTextEditor.selection);
     }
 
-    return text.split("\n");
+    return text.split('\n');
 }
 
 export function surroundSelection(textArray: string[], rFunctionName: string[]) {
     if (rFunctionName && rFunctionName.length) {
-        let rFunctionCall = "";
+        let rFunctionCall = '';
         for (const feature of rFunctionName) {
             rFunctionCall += `${feature}(`;
         }
         textArray[0] = rFunctionCall + textArray[0].trimLeft();
         const end = textArray.length - 1;
-        textArray[end] = textArray[end].trimRight() + ")".repeat(rFunctionName.length);
+        textArray[end] = textArray[end].trimRight() + ')'.repeat(rFunctionName.length);
     }
 
     return textArray;
@@ -57,7 +57,7 @@ export function getSelection() {
         selectedLine = currentDocument.getText(new Range(start, end));
     }
 
-    const selectedTextArray = selectedLine.split("\n");
+    const selectedTextArray = selectedLine.split('\n');
     selection.selectedTextArray = removeCommentedLines(selectedTextArray);
 
     return selection;
@@ -76,14 +76,14 @@ export function checkForBlankOrComment(line: string): boolean {
     let index = 0;
     let isWhitespaceOnly = true;
     while (index < line.length) {
-        if (!((line[index] === " ") || (line[index] === "\t") || (line[index] === "\r"))) {
+        if (!((line[index] === ' ') || (line[index] === '\t') || (line[index] === '\r'))) {
             isWhitespaceOnly = false;
             break;
         }
         index += 1;
     }
 
-    return isWhitespaceOnly || line[index] === "#";
+    return isWhitespaceOnly || line[index] === '#';
 }
 
 /**
@@ -100,17 +100,17 @@ class PositionNeg {
 }
 
 function doBracketsMatch(a: string, b: string): boolean {
-    const matches = { "(": ")", "[": "]", "{": "}", ")": "(", "]": "[", "}": "{" };
+    const matches = { '(': ')', '[': ']', '{': '}', ')': '(', ']': '[', '}': '{' };
 
     return matches[a] === b;
 }
 
 function isBracket(c: string, lookingForward: boolean) {
     if (lookingForward) {
-        return ((c === "(") || (c === "[") || (c === "{"));
+        return ((c === '(') || (c === '[') || (c === '{'));
     }
 
-    return ((c === ")") || (c === "]") || (c === "}"));
+    return ((c === ')') || (c === ']') || (c === '}'));
 }
 
 /**
diff --git a/src/session.ts b/src/session.ts
index 00312df0d..e79c726e8 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -1,14 +1,14 @@
 // tslint:disable: no-console
-"use strict";
+'use strict';
 
-import fs = require("fs-extra");
-import os = require("os");
-import path = require("path");
-import { URL } from "url";
-import { commands, FileSystemWatcher, RelativePattern, StatusBarItem, Uri, ViewColumn, Webview, window, workspace } from "vscode";
+import fs = require('fs-extra');
+import os = require('os');
+import path = require('path');
+import { URL } from 'url';
+import { commands, FileSystemWatcher, RelativePattern, StatusBarItem, Uri, ViewColumn, Webview, window, workspace } from 'vscode';
 
-import { chooseTerminalAndSendText } from "./rTerminal";
-import { config } from "./util";
+import { chooseTerminalAndSendText } from './rTerminal';
+import { config } from './util';
 
 export let globalenv: any;
 let responseWatcher: FileSystemWatcher;
@@ -19,49 +19,49 @@ let tempDir: string;
 let plotDir: string;
 let resDir: string;
 let responseLineCount: number;
-const sessionDir = path.join(".vscode", "vscode-R");
+const sessionDir = path.join('.vscode', 'vscode-R');
 
 export function deploySessionWatcher(extensionPath: string) {
     console.info(`[deploySessionWatcher] extensionPath: ${extensionPath}`);
-    resDir = path.join(extensionPath, "dist", "resources");
-    const targetDir = path.join(os.homedir(), ".vscode-R");
+    resDir = path.join(extensionPath, 'dist', 'resources');
+    const targetDir = path.join(os.homedir(), '.vscode-R');
     console.info(`[deploySessionWatcher] targetDir: ${targetDir}`);
     if (!fs.existsSync(targetDir)) {
-        console.info("[deploySessionWatcher] targetDir not exists, create directory");
+        console.info('[deploySessionWatcher] targetDir not exists, create directory');
         fs.mkdirSync(targetDir);
     }
-    console.info("[deploySessionWatcher] Deploy init.R");
-    fs.copySync(path.join(extensionPath, "R", "init.R"), path.join(targetDir, "init.R"));
-    console.info("[deploySessionWatcher] Deploy .Rprofile");
-    fs.copySync(path.join(extensionPath, "R", ".Rprofile"), path.join(targetDir, ".Rprofile"));
-    console.info("[deploySessionWatcher] Done");
+    console.info('[deploySessionWatcher] Deploy init.R');
+    fs.copySync(path.join(extensionPath, 'R', 'init.R'), path.join(targetDir, 'init.R'));
+    console.info('[deploySessionWatcher] Deploy .Rprofile');
+    fs.copySync(path.join(extensionPath, 'R', '.Rprofile'), path.join(targetDir, '.Rprofile'));
+    console.info('[deploySessionWatcher] Done');
 }
 
 export function startResponseWatcher(sessionStatusBarItem: StatusBarItem) {
-    console.info("[startResponseWatcher] Starting");
+    console.info('[startResponseWatcher] Starting');
     responseLineCount = 0;
     responseWatcher = workspace.createFileSystemWatcher(
         new RelativePattern(
             workspace.workspaceFolders[0],
-            path.join(".vscode", "vscode-R", "response.log")));
+            path.join('.vscode', 'vscode-R', 'response.log')));
     responseWatcher.onDidCreate(() => updateResponse(sessionStatusBarItem));
     responseWatcher.onDidChange(() => updateResponse(sessionStatusBarItem));
-    console.info("[startResponseWatcher] Done");
+    console.info('[startResponseWatcher] Done');
 }
 
 export function attachActive() {
-    if (config.get("sessionWatcher")) {
-        console.info("[attachActive]");
-        chooseTerminalAndSendText("getOption('vscodeR')$attach()");
+    if (config.get('sessionWatcher')) {
+        console.info('[attachActive]');
+        chooseTerminalAndSendText('getOption(\'vscodeR\')$attach()');
     } else {
-        window.showInformationMessage("This command requires that r.sessionWatcher be enabled.");
+        window.showInformationMessage('This command requires that r.sessionWatcher be enabled.');
     }
 }
 
 function removeDirectory(dir: string) {
     console.info(`[removeDirectory] dir: ${dir}`);
     if (fs.existsSync(dir)) {
-        console.info("[removeDirectory] dir exists");
+        console.info('[removeDirectory] dir exists');
         fs.readdirSync(dir)
           .forEach((file) => {
               const curPath = path.join(dir, file);
@@ -71,50 +71,50 @@ function removeDirectory(dir: string) {
         console.info(`[removeDirectory] Remove dir ${dir}`);
         fs.rmdirSync(dir);
     }
-    console.info("[removeDirectory] Done");
+    console.info('[removeDirectory] Done');
 }
 
 export function removeSessionFiles() {
     const sessionPath = path.join(
         workspace.workspaceFolders[0].uri.fsPath, sessionDir, pid);
-    console.info("[removeSessionFiles] ", sessionPath);
+    console.info('[removeSessionFiles] ', sessionPath);
     if (fs.existsSync(sessionPath)) {
         removeDirectory(sessionPath);
     }
-    console.info("[removeSessionFiles] Done");
+    console.info('[removeSessionFiles] Done');
 }
 
 function updateSessionWatcher() {
     console.info(`[updateSessionWatcher] PID: ${pid}`);
-    console.info("[updateSessionWatcher] Create globalEnvWatcher");
+    console.info('[updateSessionWatcher] Create globalEnvWatcher');
     globalEnvWatcher = workspace.createFileSystemWatcher(
         new RelativePattern(
             workspace.workspaceFolders[0],
-            path.join(sessionDir, pid, "globalenv.json")));
+            path.join(sessionDir, pid, 'globalenv.json')));
     globalEnvWatcher.onDidChange(updateGlobalenv);
 
-    console.info("[updateSessionWatcher] Create plotWatcher");
+    console.info('[updateSessionWatcher] Create plotWatcher');
     plotWatcher = workspace.createFileSystemWatcher(
         new RelativePattern(
             workspace.workspaceFolders[0],
-            path.join(sessionDir, pid, "plot.png")));
+            path.join(sessionDir, pid, 'plot.png')));
     plotWatcher.onDidCreate(updatePlot);
     plotWatcher.onDidChange(updatePlot);
 
-    console.info("[updateSessionWatcher] Done");
+    console.info('[updateSessionWatcher] Done');
 }
 
 function _updatePlot() {
     const plotPath = path.join(workspace.workspaceFolders[0].uri.fsPath,
-                               sessionDir, pid, "plot.png");
+                               sessionDir, pid, 'plot.png');
     console.info(`[_updatePlot] ${plotPath}`);
     if (fs.existsSync(plotPath)) {
-        commands.executeCommand("vscode.open", Uri.file(plotPath), {
+        commands.executeCommand('vscode.open', Uri.file(plotPath), {
             preserveFocus: true,
             preview: true,
             viewColumn: ViewColumn.Two,
         });
-        console.info("[_updatePlot] Done");
+        console.info('[_updatePlot] Done');
     }
 }
 
@@ -124,11 +124,11 @@ function updatePlot(event) {
 
 async function _updateGlobalenv() {
     const globalenvPath = path.join(workspace.workspaceFolders[0].uri.fsPath,
-                                    sessionDir, pid, "globalenv.json");
+                                    sessionDir, pid, 'globalenv.json');
     console.info(`[_updateGlobalenv] ${globalenvPath}`);
-    const content = await fs.readFile(globalenvPath, "utf8");
+    const content = await fs.readFile(globalenvPath, 'utf8');
     globalenv = JSON.parse(content);
-    console.info("[_updateGlobalenv] Done");
+    console.info('[_updateGlobalenv] Done');
 }
 
 async function updateGlobalenv(event) {
@@ -139,7 +139,7 @@ function showBrowser(url: string) {
     console.info(`[showBrowser] uri: ${url}`);
     const port = parseInt(new URL(url).port, 10);
     const panel = window.createWebviewPanel(
-        "browser",
+        'browser',
         url,
         {
             preserveFocus: true,
@@ -156,7 +156,7 @@ function showBrowser(url: string) {
             ],
         });
     panel.webview.html = getBrowserHtml(url);
-    console.info("[showBrowser] Done");
+    console.info('[showBrowser] Done');
 }
 
 function getBrowserHtml(url: string) {
@@ -179,7 +179,7 @@ function getBrowserHtml(url: string) {
 async function showWebView(file: string, viewColumn: ViewColumn) {
     console.info(`[showWebView] file: ${file}`);
     const dir = path.dirname(file);
-    const panel = window.createWebviewPanel("webview", "WebView",
+    const panel = window.createWebviewPanel('webview', 'WebView',
                                             {
             preserveFocus: true,
             viewColumn,
@@ -191,17 +191,17 @@ async function showWebView(file: string, viewColumn: ViewColumn) {
         });
     const content = await fs.readFile(file);
     const html = content.toString()
-        .replace("", "', '
   
   
-  
-  
-  
+  
+  
+  
   
 
 
-    

-