Skip to content

Commit

Permalink
Merge branch 'master' into copyWorksheets
Browse files Browse the repository at this point in the history
  • Loading branch information
ckipp01 committed Dec 18, 2020
2 parents a5d6b2f + bff330f commit ce52d3a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -557,13 +557,13 @@
"format-check": "prettier --check '**/*.{ts,js,json,yml}'"
},
"devDependencies": {
"@types/node": "14.14.12",
"@types/node": "14.14.14",
"@types/shell-quote": "1.7.0",
"@types/vscode": "1.43.0",
"ovsx": "0.1.0-next.9321255",
"prettier": "2.2.1",
"typescript": "4.1.2",
"vsce": "1.81.1"
"typescript": "4.1.3",
"vsce": "1.83.0"
},
"dependencies": {
"metals-languageclient": "0.4.0",
Expand Down
1 change: 0 additions & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,6 @@ function launchMetals(
});
});

// TODO replace with ServerCommand when done
registerTextEditorCommand(
`metals.${ServerCommands.CopyWorksheetOutput}`,
(editor, _edit, _args) => {
Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@types/node@*", "@types/[email protected].12":
version "14.14.12"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.12.tgz#0b1d86f8c40141091285dea02e4940df73bba43f"
integrity sha512-ASH8OPHMNlkdjrEdmoILmzFfsJICvhBsFfAum4aKZ/9U4B6M6tTmTPh+f3ttWdD74CEGV5XvXWkbyfSdXaTd7g==
"@types/node@*", "@types/[email protected].14":
version "14.14.14"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae"
integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ==

"@types/[email protected]":
version "1.7.0"
Expand Down Expand Up @@ -489,10 +489,10 @@ [email protected]:
tunnel "0.0.4"
underscore "1.8.3"

[email protected].2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
[email protected].3:
version "4.1.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==

uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.5"
Expand All @@ -514,10 +514,10 @@ util-deprecate@^1.0.1:
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

vsce@1.81.1, vsce@^1.73.0:
version "1.81.1"
resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.81.1.tgz#c741e9830cc750925e5f37b1e048341b98125262"
integrity sha512-1yWAYRxTx/PKSFZnuELe7GPyIo70H/XKJqf6wGikofUK3f3TCNGI6F9xkTQFvXKNe0AygUuxN7kITyPIQGMP+w==
vsce@1.83.0, vsce@^1.73.0:
version "1.83.0"
resolved "https://registry.yarnpkg.com/vsce/-/vsce-1.83.0.tgz#61774e5389a8654e307c65ec392cf61534f65bcb"
integrity sha512-gyF/xtCOFcKO+EvC0FQu5jPECHz2XKMWcw62gqwJJ22lVvlj58t49sWe1IGl9S5NpxCek+QMm6V9i/cDwGWs/Q==
dependencies:
azure-devops-node-api "^7.2.0"
chalk "^2.4.2"
Expand Down

0 comments on commit ce52d3a

Please sign in to comment.