From 3fa210261a22854b188acd6967bd17a9997c08e6 Mon Sep 17 00:00:00 2001 From: nerd553 Date: Sat, 24 Nov 2018 12:45:53 +0200 Subject: [PATCH 1/9] Added support for all cursor styles --- package.json | 2 +- src/configuration.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 09dde2d..6026418 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ }, "main": "./out/extension", "engines": { - "vscode": "^1.0.0" + "vscode": "^1.10.0" }, "activationEvents": [ "*" diff --git a/src/configuration.ts b/src/configuration.ts index 7b696be..e0ecce7 100644 --- a/src/configuration.ts +++ b/src/configuration.ts @@ -15,8 +15,11 @@ function loadConfiguration() { defaultCursorStyle: (() => { switch (editorConfiguration.get("cursorStyle")) { case "line": return vscode.TextEditorCursorStyle.Line; + case "line-thin": return vscode.TextEditorCursorStyle.LineThin; case "block": return vscode.TextEditorCursorStyle.Block; + case "block-outline": return vscode.TextEditorCursorStyle.BlockOutline; case "underline": return vscode.TextEditorCursorStyle.Underline; + case "underline-thin": return vscode.TextEditorCursorStyle.UnderlineThin; default: return vscode.TextEditorCursorStyle.Line; } })(), From c64e5727b5a769a694ffd407979ba4f32d01bddd Mon Sep 17 00:00:00 2001 From: nerd553 Date: Sat, 24 Nov 2018 13:46:21 +0200 Subject: [PATCH 2/9] Added customizable overtype cursor --- package.json | 5 +++++ src/configuration.ts | 35 ++++++++++++++++++++++++----------- src/extension.ts | 13 ++++++++----- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 6026418..3c62b37 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,11 @@ "type": "boolean", "default": false, "description": "Sets the insert/overtype mode per editor." + }, + "overtype.secondaryCursorStyle": { + "type": "string", + "default": "block", + "description": "Sets the overtype cursor style." } } }, diff --git a/src/configuration.ts b/src/configuration.ts index e0ecce7..1b97d2b 100644 --- a/src/configuration.ts +++ b/src/configuration.ts @@ -2,6 +2,18 @@ import * as vscode from "vscode"; export const configuration = loadConfiguration(); +function stringToCursorStyle(config: vscode.WorkspaceConfiguration, style: string, def: vscode.TextEditorCursorStyle) { + switch (config.get(style)) { + case "line": return vscode.TextEditorCursorStyle.Line; + case "line-thin": return vscode.TextEditorCursorStyle.LineThin; + case "block": return vscode.TextEditorCursorStyle.Block; + case "block-outline": return vscode.TextEditorCursorStyle.BlockOutline; + case "underline": return vscode.TextEditorCursorStyle.Underline; + case "underline-thin": return vscode.TextEditorCursorStyle.UnderlineThin; + default: return def; + } +} + function loadConfiguration() { const overtypeConfiguration = vscode.workspace.getConfiguration("overtype"); const editorConfiguration = vscode.workspace.getConfiguration("editor"); @@ -9,19 +21,18 @@ function loadConfiguration() { return { abbreviatedStatus: overtypeConfiguration.get("abbreviatedStatus"), paste: overtypeConfiguration.get("paste"), - perEditor: overtypeConfiguration.get("perEditor"), + perEditor: overtypeConfiguration.get("perEditor") ? true : false, // tslint:disable-next-line:object-literal-sort-keys defaultCursorStyle: (() => { - switch (editorConfiguration.get("cursorStyle")) { - case "line": return vscode.TextEditorCursorStyle.Line; - case "line-thin": return vscode.TextEditorCursorStyle.LineThin; - case "block": return vscode.TextEditorCursorStyle.Block; - case "block-outline": return vscode.TextEditorCursorStyle.BlockOutline; - case "underline": return vscode.TextEditorCursorStyle.Underline; - case "underline-thin": return vscode.TextEditorCursorStyle.UnderlineThin; - default: return vscode.TextEditorCursorStyle.Line; - } + return stringToCursorStyle(editorConfiguration, "cursorStyle", + vscode.TextEditorCursorStyle.Block); + })(), + + // Get the user defined cursor style for overtype mode + secondaryCursorStyle: (() => { + return stringToCursorStyle(overtypeConfiguration, "secondaryCursorStyle", + vscode.TextEditorCursorStyle.Line); })(), }; } @@ -33,7 +44,8 @@ export function reloadConfiguration() { if (configuration.abbreviatedStatus === newConfiguration.abbreviatedStatus && configuration.paste === newConfiguration.paste && configuration.perEditor === newConfiguration.perEditor && - configuration.defaultCursorStyle === newConfiguration.defaultCursorStyle) { + configuration.defaultCursorStyle === newConfiguration.defaultCursorStyle && + configuration.secondaryCursorStyle === newConfiguration.secondaryCursorStyle) { return false; } @@ -41,6 +53,7 @@ export function reloadConfiguration() { configuration.paste = newConfiguration.paste; configuration.perEditor = newConfiguration.perEditor; configuration.defaultCursorStyle = newConfiguration.defaultCursorStyle; + configuration.secondaryCursorStyle = newConfiguration.secondaryCursorStyle; return true; } diff --git a/src/extension.ts b/src/extension.ts index ec82e4b..1e98183 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -42,9 +42,9 @@ function activeTextEditorChanged(textEditor?: vscode.TextEditor) { const mode = getMode(textEditor); updateStatusBarItem(mode); - // if in overtype mode, set the cursor to block style; otherwise, reset to default + // if in overtype mode, set the cursor to secondary style; otherwise, reset to default textEditor.options.cursorStyle = mode - ? vscode.TextEditorCursorStyle.Block + ? configuration.secondaryCursorStyle : configuration.defaultCursorStyle; } } @@ -68,7 +68,6 @@ function onDidChangeConfiguration() { const textEditor = vscode.window.activeTextEditor; const mode = textEditor != null ? getMode(textEditor) : null; - resetModes(mode, configuration.perEditor); } @@ -89,7 +88,9 @@ function shouldPerformOvertype() { function typeCommand(args: { text: string }) { if (shouldPerformOvertype()) { const editor = vscode.window.activeTextEditor; - overtypeBeforeType(editor, args.text); + if (editor) { + overtypeBeforeType(editor, args.text); + } } return vscode.commands.executeCommand("default:type", args); @@ -98,7 +99,9 @@ function typeCommand(args: { text: string }) { function pasteCommand(args: { text: string, pasteOnNewLine: boolean }) { if (configuration.paste && shouldPerformOvertype()) { const editor = vscode.window.activeTextEditor; - overtypeBeforePaste(editor, args.text, args.pasteOnNewLine); + if (editor) { + overtypeBeforePaste(editor, args.text, args.pasteOnNewLine); + } } return vscode.commands.executeCommand("default:paste", args); From 38682529610896e9c7016c1c910b2d0ef040bebb Mon Sep 17 00:00:00 2001 From: Linus Marco Date: Mon, 1 Jul 2019 13:24:31 -0400 Subject: [PATCH 3/9] Fix release badge in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75c7563..c185443 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Overtype for Visual Studio Code [![Visual Studio Marketplace](http://vsmarketplacebadge.apphb.com/version/adammaras.overtype.svg)](https://marketplace.visualstudio.com/items?itemName=adammaras.overtype) -[![GitHub release](https://img.shields.io/github/release/AdamMaras/vscode-overtype.svg)](https://github.com/AdamMaras/vscode-overtype/releases) +[![GitHub release](https://img.shields.io/github/release/AdamMaras/vscode-overtype/all.svg)](https://github.com/AdamMaras/vscode-overtype/releases) [![GitHub issues](https://img.shields.io/github/issues/AdamMaras/vscode-overtype.svg)](https://github.com/AdamMaras/vscode-overtype/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr/AdamMaras/vscode-overtype.svg)](https://github.com/AdamMaras/vscode-overtype/pulls) ![README badges](https://img.shields.io/badge/readme_badges-5-green.svg) From 4dee967c779e16b03e204d800f356bcf054a1fa8 Mon Sep 17 00:00:00 2001 From: George Melissourgos Date: Sat, 2 Jan 2021 14:19:00 +0200 Subject: [PATCH 4/9] OVSX ready --- .gitignore | 1 + .vscodeignore | 2 +- README.md | 45 ++- images/icon.png | Bin 0 -> 20845 bytes package.json | 12 +- yarn.lock | 911 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 953 insertions(+), 18 deletions(-) create mode 100644 images/icon.png create mode 100644 yarn.lock diff --git a/.gitignore b/.gitignore index f01b375..8030ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ Icon # Project node_modules out +*.vsix diff --git a/.vscodeignore b/.vscodeignore index f7bc848..c3d320a 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -1,7 +1,7 @@ **/* !images/demo-basic.gif !images/demo-basic@2x.gif -!images/icon.svg +!images/icon.png !out/**/* !CHANGELOG.md !LICENSE diff --git a/README.md b/README.md index c185443..b7a9b4d 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,17 @@ # Overtype for Visual Studio Code -[![Visual Studio Marketplace](http://vsmarketplacebadge.apphb.com/version/adammaras.overtype.svg)](https://marketplace.visualstudio.com/items?itemName=adammaras.overtype) -[![GitHub release](https://img.shields.io/github/release/AdamMaras/vscode-overtype/all.svg)](https://github.com/AdamMaras/vscode-overtype/releases) -[![GitHub issues](https://img.shields.io/github/issues/AdamMaras/vscode-overtype.svg)](https://github.com/AdamMaras/vscode-overtype/issues) -[![GitHub pull requests](https://img.shields.io/github/issues-pr/AdamMaras/vscode-overtype.svg)](https://github.com/AdamMaras/vscode-overtype/pulls) +[![Open VSX Registry](https://img.shields.io/open-vsx/v/drmerfy/overtype)](https://open-vsx.org/extension/DrMerfy/overtype) +[![Visual Studio Marketplace](https://vsmarketplacebadge.apphb.com/version/DrMerfy.overtype.svg)](https://marketplace.visualstudio.com/items?itemName=DrMerfy.overtype) +[![GitHub release](https://img.shields.io/github/release/DrMerfy/vscode-overtype/all.svg)](https://github.com/DrMerfy/vscode-overtype/releases) +[![GitHub issues](https://img.shields.io/github/issues/DrMerfy/vscode-overtype.svg)](https://github.com/DrMerfy/vscode-overtype/issues) +[![GitHub pull requests](https://img.shields.io/github/issues-pr/DrMerfy/vscode-overtype.svg)](https://github.com/DrMerfy/vscode-overtype/pulls) ![README badges](https://img.shields.io/badge/readme_badges-5-green.svg) Because some people actually press the Insert key on purpose. +## This is the continuation fork of the project :) +## Original author: [Adam Maras](https://github.com/AdamMaras) + ## Features Adds an overtype mode to Visual Studio Code, plus a couple of bells and whistles. @@ -37,7 +41,7 @@ Fine. If you want to enable Hard Mode, you can turn on overtype paste mode. This setting applies overtype behavior to when you paste text into your editor. Here are the rules: - If you paste part of a line of text into another line of text, the clipboard contents will overwrite characters until it's done pasting, unless it hits the end of the line first, in which case it'll just extend that line. - - If you already have some text selected when you paste, that text will *always* be overwritten, even if the contents of the clipboard are smaller. +- If you already have some text selected when you paste, that text will *always* be overwritten, even if the contents of the clipboard are smaller. - If you paste some multiline text into a line of text, everything left on that line will be overwritten with the first line of the pasted text, and the remaining pasted lines will be inserted below that line. - If you cut or copy using Visual Studio Code's feature that grabs the entire line when you don't have anything selected, pasting that line will overwrite the *entire* line that you're pasting on. @@ -45,7 +49,7 @@ Some additional tips for using overtype paste: - Don't forget your Undo shortcut(s). - I know this doesn't work like [insert editor here]. Every single freaking editor handles overtype paste differently. It's not my fault. -- If you think you have a saner way to handle this, for the love of everything warm and cuddly, [MAKE A PULL REQUEST](https://github.com/AdamMaras/vscode-overtype/pulls). +- If you think you have a saner way to handle this, for the love of everything warm and cuddly, [MAKE A PULL REQUEST](https://github.com/DrMerfy/vscode-overtype/pulls). Without further ado... @@ -65,18 +69,37 @@ Horizontal screen space at a premium? Have too many things in your status bar al > Shows an abbreviated overtype status (`INS`/`OVR`) in the status line. +### Overtype cursor style + +You can change the overtype cursor style from the preferences. +Set the `overtype.secondaryCursorStyle` to either one of: + +- line +- line-thin +- block +- block-outline +- underline +- underline-thin + +e.g. + +```json +"overtype.secondaryCursorStyle": "underline" +``` + +> Sets the overtype cursor style. + ## Contributing How can you contribute? -- [**Open an issue**](https://github.com/AdamMaras/vscode-overtype/issues) if you found a problem. -- [**Make a pull request**](https://github.com/AdamMaras/vscode-overtype/pulls) if you fixed a problem! -- [**Complain on Twitter**](https://twitter.com/AdamMaras) if *I'm* the problem. +- [**Open an issue**](https://github.com/DrMerfy/vscode-overtype/issues) if you found a problem. +- [**Make a pull request**](https://github.com/DrMerfy/vscode-overtype/pulls) if you fixed a problem! ## Release notes -There's a [`CHANGELOG.md`](https://github.com/AdamMaras/vscode-overtype/blob/master/CHANGELOG.md) file. +There's a [`CHANGELOG.md`](https://github.com/DrMerfy/vscode-overtype/blob/master/CHANGELOG.md) file. ## License -There's a [`LICENSE`](https://github.com/AdamMaras/vscode-overtype/blob/master/LICENSE) file. It's the [BSD 2-Clause](https://opensource.org/licenses/BSD-2-Clause) license. +There's a [`LICENSE`](https://github.com/DrMerfy/vscode-overtype/blob/master/LICENSE) file. It's the [BSD 2-Clause](https://opensource.org/licenses/BSD-2-Clause) license. diff --git a/images/icon.png b/images/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bc5b27a7a710882f974d23f2df9528afcc5b1a28 GIT binary patch literal 20845 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 literal 0 HcmV?d00001 diff --git a/package.json b/package.json index 3c62b37..f748a22 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "overtype", - "version": "0.2.0", + "version": "0.3.1", "displayName": "Overtype", "description": "Provides insert/overtype mode.", - "publisher": "adammaras", + "publisher": "DrMerfy", "categories": [ "Other" ], @@ -12,17 +12,17 @@ "overwrite", "insert" ], - "icon": "images/icon.svg", + "icon": "images/icon.png", "galleryBanner": { "color": "#1e1e1e", "theme": "dark" }, "license": "BSD-2-Clause", - "homepage": "https://github.com/AdamMaras/vscode-overtype", - "bugs": "https://github.com/AdamMaras/vscode-overtype/issues", + "homepage": "https://github.com/DrMerfy/vscode-overtype", + "bugs": "https://github.com/DrMerfy/vscode-overtype/issues", "repository": { "type": "git", - "url": "https://github.com/AdamMaras/vscode-overtype.git" + "url": "https://github.com/DrMerfy/vscode-overtype" }, "main": "./out/extension", "engines": { diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000..86bc0bb --- /dev/null +++ b/yarn.lock @@ -0,0 +1,911 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + +agent-base@4, agent-base@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" + integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== + dependencies: + es6-promisify "^5.0.0" + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +ansi-align@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-1.1.0.tgz#2f0c1658829739add5ebb15e6b0c6e3423f016ba" + integrity sha1-LwwWWIKXOa3V67FeawxuNCPwFro= + dependencies: + string-width "^1.0.1" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + +babel-code-frame@^6.20.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" + integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= + dependencies: + chalk "^1.1.3" + esutils "^2.0.2" + js-tokens "^3.0.2" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +boxen@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-0.6.0.tgz#8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6" + integrity sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY= + dependencies: + ansi-align "^1.1.0" + camelcase "^2.1.0" + chalk "^1.1.1" + cli-boxes "^1.0.0" + filled-array "^1.0.0" + object-assign "^4.0.1" + repeating "^2.0.0" + string-width "^1.0.1" + widest-line "^1.0.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +browser-stdout@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" + integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +camelcase@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= + +capture-stack-trace@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" + integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw== + +chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +cli-boxes@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" + integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM= + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + +colors@^1.1.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + +commander@2.15.1: + version "2.15.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" + integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +configstore@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-2.1.0.tgz#737a3a7036e9886102aa6099e47bb33ab1aba1a1" + integrity sha1-c3o6cDbpiGECqmCZ5HuzOrGroaE= + dependencies: + dot-prop "^3.0.0" + graceful-fs "^4.1.2" + mkdirp "^0.5.0" + object-assign "^4.0.1" + os-tmpdir "^1.0.0" + osenv "^0.1.0" + uuid "^2.0.1" + write-file-atomic "^1.1.2" + xdg-basedir "^2.0.0" + +core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +create-error-class@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" + integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y= + dependencies: + capture-stack-trace "^1.0.0" + +debug@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + +debug@4: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +debug@^3.1.0: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +diff@3.5.0, diff@^3.0.1: + version "3.5.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" + integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== + +dot-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177" + integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc= + dependencies: + is-obj "^1.0.0" + +duplexer2@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" + integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= + dependencies: + readable-stream "^2.0.2" + +error-ex@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es6-promise@^4.0.3: + version "4.2.8" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" + integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== + +es6-promisify@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" + integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= + dependencies: + es6-promise "^4.0.3" + +escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +filled-array@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/filled-array/-/filled-array-1.1.0.tgz#c3c4f6c663b923459a9aa29912d2d031f1507f84" + integrity sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q= + +findup-sync@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16" + integrity sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY= + dependencies: + glob "~5.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +glob@7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== + dependencies: + 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@^7.1.1, glob@^7.1.2: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + 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@~5.0.0: + version "5.0.15" + resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" + integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +got@^5.0.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/got/-/got-5.7.1.tgz#5f81635a61e4a6589f180569ea4e381680a51f35" + integrity sha1-X4FjWmHkplifGAVp6k44FoClHzU= + dependencies: + create-error-class "^3.0.1" + duplexer2 "^0.1.4" + is-redirect "^1.0.0" + is-retry-allowed "^1.0.0" + is-stream "^1.0.0" + lowercase-keys "^1.0.0" + node-status-codes "^1.0.0" + object-assign "^4.0.1" + parse-json "^2.1.0" + pinkie-promise "^2.0.0" + read-all-stream "^3.0.0" + readable-stream "^2.0.5" + timed-out "^3.0.0" + unzip-response "^1.0.2" + url-parse-lax "^1.0.0" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + +growl@1.10.5: + version "1.10.5" + resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" + integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +he@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" + integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0= + +http-proxy-agent@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405" + integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg== + dependencies: + agent-base "4" + debug "3.1.0" + +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + +https-proxy-agent@^2.2.1: + version "2.2.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" + integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== + dependencies: + agent-base "^4.3.0" + debug "^3.1.0" + +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-core-module@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" + integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== + dependencies: + has "^1.0.3" + +is-finite@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" + integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-npm@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" + integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ= + +is-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= + +is-redirect@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" + integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= + +is-retry-allowed@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" + integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== + +is-stream@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +js-tokens@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= + +latest-version@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-2.0.0.tgz#56f8d6139620847b8017f8f1f4d78e211324168b" + integrity sha1-VvjWE5YghHuAF/jx9NeOIRMkFos= + dependencies: + package-json "^2.0.0" + +lazy-req@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-1.1.0.tgz#bdaebead30f8d824039ce0ce149d4daa07ba1fac" + integrity sha1-va6+rTD42CQDnODOFJ1Nqge6H6w= + +lowercase-keys@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + +"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= + +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +minimist@~0.0.1: + version "0.0.10" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" + integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= + +mkdirp@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + dependencies: + minimist "0.0.8" + +mkdirp@^0.5.0: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +mocha@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" + integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== + dependencies: + browser-stdout "1.3.1" + commander "2.15.1" + debug "3.1.0" + diff "3.5.0" + escape-string-regexp "1.0.5" + glob "7.1.2" + growl "1.10.5" + he "1.1.1" + minimatch "3.0.4" + mkdirp "0.5.1" + supports-color "5.4.0" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +node-status-codes@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" + integrity sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8= + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +object-assign@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +optimist@~0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" + integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY= + dependencies: + minimist "~0.0.1" + wordwrap "~0.0.2" + +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + +os-tmpdir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + +osenv@^0.1.0: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +package-json@^2.0.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-2.4.0.tgz#0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb" + integrity sha1-DRW9Z9HLvduyyiIv8u24a8sxqLs= + dependencies: + got "^5.0.0" + registry-auth-token "^3.0.1" + registry-url "^3.0.3" + semver "^5.1.0" + +parse-json@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= + dependencies: + error-ex "^1.2.0" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + +prepend-http@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +rc@^1.0.1, rc@^1.1.6: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +read-all-stream@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa" + integrity sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po= + dependencies: + pinkie-promise "^2.0.0" + readable-stream "^2.0.0" + +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + 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" + +registry-auth-token@^3.0.1: + version "3.4.0" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e" + integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A== + dependencies: + rc "^1.1.6" + safe-buffer "^5.0.1" + +registry-url@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" + integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI= + dependencies: + rc "^1.0.1" + +repeating@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" + integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + dependencies: + is-finite "^1.0.0" + +resolve@^1.1.7: + version "1.19.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" + integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== + dependencies: + is-core-module "^2.1.0" + path-parse "^1.0.6" + +safe-buffer@^5.0.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +semver-diff@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" + integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY= + dependencies: + semver "^5.0.3" + +semver@^5.0.3, semver@^5.1.0, semver@^5.4.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +slide@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" + integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= + +source-map-support@^0.5.0: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +sprintf-js@^1.0.3: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +supports-color@5.4.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" + integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w== + dependencies: + has-flag "^3.0.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +timed-out@^3.0.0: + version "3.1.3" + resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217" + integrity sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc= + +tslint@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-4.1.1.tgz#ae15c9478d92eb2f01d5102c69c493ec02d7e7e4" + integrity sha1-rhXJR42S6y8B1RAsacST7ALX5+Q= + dependencies: + babel-code-frame "^6.20.0" + colors "^1.1.2" + diff "^3.0.1" + findup-sync "~0.3.0" + glob "^7.1.1" + optimist "~0.6.0" + resolve "^1.1.7" + underscore.string "^3.3.4" + update-notifier "^1.0.2" + +typescript@^2.1.0: + version "2.9.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c" + integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w== + +underscore.string@^3.3.4: + version "3.3.5" + resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023" + integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg== + dependencies: + sprintf-js "^1.0.3" + util-deprecate "^1.0.2" + +unzip-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe" + integrity sha1-uYTwh3/AqJwsdzzB73tbIytbBv4= + +update-notifier@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-1.0.3.tgz#8f92c515482bd6831b7c93013e70f87552c7cf5a" + integrity sha1-j5LFFUgr1oMbfJMBPnD4dVLHz1o= + dependencies: + boxen "^0.6.0" + chalk "^1.0.0" + configstore "^2.0.0" + is-npm "^1.0.0" + latest-version "^2.0.0" + lazy-req "^1.1.0" + semver-diff "^2.0.0" + xdg-basedir "^2.0.0" + +url-parse-lax@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" + integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= + dependencies: + prepend-http "^1.0.1" + +util-deprecate@^1.0.2, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +uuid@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" + integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho= + +vscode-test@^0.4.1: + version "0.4.3" + resolved "https://registry.yarnpkg.com/vscode-test/-/vscode-test-0.4.3.tgz#461ebf25fc4bc93d77d982aed556658a2e2b90b8" + integrity sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w== + dependencies: + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.1" + +vscode@^1.0.0: + version "1.1.37" + resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.37.tgz#c2a770bee4bb3fff765e2b72c7bcc813b8a6bb0a" + integrity sha512-vJNj6IlN7IJPdMavlQa1KoFB3Ihn06q1AiN3ZFI/HfzPNzbKZWPPuiU+XkpNOfGU5k15m4r80nxNPlM7wcc0wg== + dependencies: + glob "^7.1.2" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + mocha "^5.2.0" + semver "^5.4.1" + source-map-support "^0.5.0" + vscode-test "^0.4.1" + +widest-line@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c" + integrity sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw= + dependencies: + string-width "^1.0.1" + +wordwrap@~0.0.2: + version "0.0.3" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" + integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +write-file-atomic@^1.1.2: + version "1.3.4" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f" + integrity sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8= + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + slide "^1.1.5" + +xdg-basedir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-2.0.0.tgz#edbc903cc385fc04523d966a335504b5504d1bd2" + integrity sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I= + dependencies: + os-homedir "^1.0.0" From 3dc82fd86aa61b20d950c1131ced3f5c255d0e36 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Mon, 4 Jan 2021 11:38:04 +0100 Subject: [PATCH 5/9] Update CHANGELOG.md added CHANGELOG for 0.3.0 and 0.3.1 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed59518..799b317 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ Notable and interesting changes will go in this file whenever a new release goes out. Boring changes will probably go in here too. Really, all changes are welcome. +## 0.3.1 + +- open-vsx ready, now also found at https://open-vsx.org/extension/DrMerfy/overtype + +## 0.3.0 + +- Continuation fork of the project. +- New configuration `overtype.secondaryCursorStyle`, to change the overtype cursor style. + ## 0.2.0 - Fixed an issue where the status indicator/cursor wouldn't be correct when Visual Studio Code opens a window with editors already open. From d232d85c5181761393a1fd25a7cbd056c72c6f37 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Mon, 4 Jan 2021 11:51:29 +0100 Subject: [PATCH 6/9] new configuration `overtype.showInStatusBar` to hide the current state in the status bar, fixes #4 --- CHANGELOG.md | 4 ++++ README.md | 10 ++++++++-- package.json | 7 ++++++- src/configuration.ts | 5 ++++- src/extension.ts | 18 ++++++++++++++---- 5 files changed, 36 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 799b317..74d7b67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Notable and interesting changes will go in this file whenever a new release goes out. Boring changes will probably go in here too. Really, all changes are welcome. +## TO BE ANNOUNCED + +- New configuration `overtype.showInStatusBar`, to allow hiding the current state in the status bar [#4](https://github.com/DrMerfy/vscode-overtype/issues/4). + ## 0.3.1 - open-vsx ready, now also found at https://open-vsx.org/extension/DrMerfy/overtype diff --git a/README.md b/README.md index b7a9b4d..20cfa0e 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ Without further ado... > When in overtype mode, uses overtype behavior when pasting text. -### Abbreviated indicators +### Abbreviated indicators (or none) Horizontal screen space at a premium? Have too many things in your status bar already? Turned your monitor sideways because somebody told you it would increase your productivity by at least 23%? Don't worry, we've got just the setting for you! @@ -67,7 +67,13 @@ Horizontal screen space at a premium? Have too many things in your status bar al "overtype.abbreviatedStatus": true ``` -> Shows an abbreviated overtype status (`INS`/`OVR`) in the status line. +> Shows an abbreviated overtype status (`INS`/`OVR`) in the status bar. + +```json +"overtype.showInStatusBar": false +``` + +> Disable showing the overtype status in the status bar. ### Overtype cursor style diff --git a/package.json b/package.json index f748a22..6de17f7 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "overtype.abbreviatedStatus": { "type": "boolean", "default": false, - "description": "Shows an abbreviated overtype status (INS/OVR) in the status line." + "description": "Shows an abbreviated overtype status (INS/OVR) in the status bar." }, "overtype.paste": { "type": "boolean", @@ -55,6 +55,11 @@ "type": "string", "default": "block", "description": "Sets the overtype cursor style." + }, + "overtype.showInStatusBar": { + "type": "boolean", + "default": true, + "description": "Shows the current overtype mode in the status bar." } } }, diff --git a/src/configuration.ts b/src/configuration.ts index 1b97d2b..3cb38a8 100644 --- a/src/configuration.ts +++ b/src/configuration.ts @@ -20,6 +20,7 @@ function loadConfiguration() { return { abbreviatedStatus: overtypeConfiguration.get("abbreviatedStatus"), + showInStatusBar: overtypeConfiguration.get("showInStatusBar"), paste: overtypeConfiguration.get("paste"), perEditor: overtypeConfiguration.get("perEditor") ? true : false, @@ -41,7 +42,8 @@ export function reloadConfiguration() { const newConfiguration = loadConfiguration(); // bail out if nothing changed - if (configuration.abbreviatedStatus === newConfiguration.abbreviatedStatus && + if (configuration.showInStatusBar === newConfiguration.showInStatusBar && + configuration.abbreviatedStatus === newConfiguration.abbreviatedStatus && configuration.paste === newConfiguration.paste && configuration.perEditor === newConfiguration.perEditor && configuration.defaultCursorStyle === newConfiguration.defaultCursorStyle && @@ -49,6 +51,7 @@ export function reloadConfiguration() { return false; } + configuration.showInStatusBar = newConfiguration.showInStatusBar; configuration.abbreviatedStatus = newConfiguration.abbreviatedStatus; configuration.paste = newConfiguration.paste; configuration.perEditor = newConfiguration.perEditor; diff --git a/src/extension.ts b/src/extension.ts index 1e98183..b42a521 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -61,19 +61,29 @@ function toggleCommand() { function onDidChangeConfiguration() { const previousPerEditor = configuration.perEditor; + const previousShowInStatusBar = configuration.showInStatusBar; + const updated = reloadConfiguration(); + if (!updated) { return; } + + // post create / destroy when changed + if (configuration.showInStatusBar !== previousShowInStatusBar) { + if (configuration.showInStatusBar) { + createStatusBarItem(); + } else { + destroyStatusBarItem(); + } + } // update state if the per-editor/global configuration option changes - if (updated && configuration.perEditor !== previousPerEditor) { + if (configuration.perEditor !== previousPerEditor) { const textEditor = vscode.window.activeTextEditor; const mode = textEditor != null ? getMode(textEditor) : null; resetModes(mode, configuration.perEditor); } - if (updated) { - activeTextEditorChanged(); - } + activeTextEditorChanged(); } function shouldPerformOvertype() { From 6807e353c357051dd67fd768ff58e8a0ccc40611 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Mon, 4 Jan 2021 12:18:10 +0100 Subject: [PATCH 7/9] changed status bar item to toggle the insert mode fixes #3 --- CHANGELOG.md | 1 + src/statusBarItem.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74d7b67..2809ef9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Notable and interesting changes will go in this file whenever a new release goes ## TO BE ANNOUNCED - New configuration `overtype.showInStatusBar`, to allow hiding the current state in the status bar [#4](https://github.com/DrMerfy/vscode-overtype/issues/4). +- The item in the status bar can now be clicked to toggle the insert mode [#3](https://github.com/DrMerfy/vscode-overtype/issues/3). ## 0.3.1 diff --git a/src/statusBarItem.ts b/src/statusBarItem.ts index 9a4046f..a4fe583 100644 --- a/src/statusBarItem.ts +++ b/src/statusBarItem.ts @@ -8,6 +8,7 @@ export function createStatusBarItem() { if (statusBarItem != null) { return statusBarItem; } statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right); + statusBarItem.command = "overtype.toggle"; statusBarItem.show(); updateStatusBarItem(null); From e0cc00b4bd824d0b9ffd5068dddeacba280dc052 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 6 Jan 2021 21:09:09 +0000 Subject: [PATCH 8/9] docs: update README.md [skip ci] --- README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.md b/README.md index 20cfa0e..ff0cda3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ # Overtype for Visual Studio Code + +[![All Contributors](https://img.shields.io/badge/all_contributors-1-orange.svg?style=flat-square)](#contributors-) + [![Open VSX Registry](https://img.shields.io/open-vsx/v/drmerfy/overtype)](https://open-vsx.org/extension/DrMerfy/overtype) [![Visual Studio Marketplace](https://vsmarketplacebadge.apphb.com/version/DrMerfy.overtype.svg)](https://marketplace.visualstudio.com/items?itemName=DrMerfy.overtype) @@ -109,3 +112,23 @@ There's a [`CHANGELOG.md`](https://github.com/DrMerfy/vscode-overtype/blob/maste ## License There's a [`LICENSE`](https://github.com/DrMerfy/vscode-overtype/blob/master/LICENSE) file. It's the [BSD 2-Clause](https://opensource.org/licenses/BSD-2-Clause) license. + +## Contributors ✨ + +Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): + + + + + + + + +

Simon Sobisch

📆
+ + + + + + +This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! \ No newline at end of file From 20c7d53f0ec4cd43126d4dbad3a560abe1f9e292 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 6 Jan 2021 21:09:10 +0000 Subject: [PATCH 9/9] docs: create .all-contributorsrc [skip ci] --- .all-contributorsrc | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .all-contributorsrc diff --git a/.all-contributorsrc b/.all-contributorsrc new file mode 100644 index 0000000..8406a5c --- /dev/null +++ b/.all-contributorsrc @@ -0,0 +1,24 @@ +{ + "files": [ + "README.md" + ], + "imageSize": 100, + "commit": false, + "contributors": [ + { + "login": "GitMensch", + "name": "Simon Sobisch", + "avatar_url": "https://avatars3.githubusercontent.com/u/6699539?v=4", + "profile": "https://github.com/GitMensch", + "contributions": [ + "projectManagement" + ] + } + ], + "contributorsPerLine": 7, + "projectName": "vscode-overtype", + "projectOwner": "DrMerfy", + "repoType": "github", + "repoHost": "https://github.com", + "skipCi": true +}