Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 499896d

Browse files
author
Tony Spataro
committed
Merge branch 'main' into tests
2 parents 9419faa + 2bc17f6 commit 499896d

File tree

4 files changed

+32
-236
lines changed

4 files changed

+32
-236
lines changed

‎package.json

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"description": "VSCode support for the syntax_tree gem",
55
"icon": "doc/logo.png",
66
"version": "0.2.1",
7-
"packageManager": "yarn@1.22.19",
87
"publisher": "ruby-syntax-tree",
98
"repository": {
109
"type": "git",
@@ -14,6 +13,7 @@
1413
"bugs": {
1514
"url": "https://github.com/ruby-syntax-tree/vscode-syntax-tree/issues"
1615
},
16+
"packageManager": "yarn@1.22.19",
1717
"engines": {
1818
"vscode": "^1.66.0"
1919
},
@@ -74,28 +74,17 @@
7474
}
7575
}
7676
},
77-
"colors": [
78-
{
79-
"id": "syntaxTree.inlayHints",
80-
"description": "Text color for the inserted inlay hints",
81-
"defaults": {
82-
"dark": "#707070",
83-
"light": "#999999",
84-
"highContrast": "foreground"
85-
}
86-
}
87-
]
77+
"colors": []
8878
},
8979
"scripts": {
9080
"compile": "tsc -p ./",
9181
"package": "vsce package --yarn --githubBranch main",
9282
"publish": "vsce publish --yarn --githubBranch main",
93-
"test": "node ./out/test/runTest.js",
9483
"vscode:prepublish": "yarn compile",
9584
"watch": "tsc --watch -p ./"
9685
},
9786
"dependencies": {
98-
"vscode-languageclient": "^8.0.1"
87+
"vscode-languageclient": "8.0.2-next.5"
9988
},
10089
"devDependencies": {
10190
"@types/glob": "^7.1.1",
@@ -107,11 +96,5 @@
10796
"mocha": "^9.1.1",
10897
"typescript": "^4.7.4",
10998
"vsce": "^2.9.2"
110-
},
111-
"__metadata": {
112-
"id": "b46118f9-0f6f-4320-9e2e-75c96492b4cb",
113-
"publisherDisplayName": "ruby-syntax-tree",
114-
"publisherId": "63942dce-de09-44d8-b863-4a1dbd5508c6",
115-
"isPreReleaseVersion": false
11699
}
117-
}
100+
}

‎src/InlayHints.ts

Lines changed: 0 additions & 190 deletions
This file was deleted.

‎src/extension.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { LanguageClient, ServerOptions } from "vscode-languageclient/node";
55
import { promisify } from "util";
66
import { exec } from "child_process";
77

8-
import InlayHints from "./InlayHints";
98
import Visualize from "./Visualize";
109

1110
const promiseExec = promisify(exec);
@@ -121,7 +120,6 @@ export async function activate(context: ExtensionContext) {
121120
// implements Disposable so that they clean up their own resources.
122121
visualizer = new Visualize(languageClient, outputChannel);
123122
context.subscriptions.push(
124-
new InlayHints(languageClient, outputChannel),
125123
visualizer
126124
);
127125
}

‎yarn.lock

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,20 @@
2525
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4"
2626
integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==
2727

28-
"@types/node@*", "@types/node@^18.0.0":
28+
"@types/node@*":
2929
version "18.0.0"
3030
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
3131
integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==
3232

33+
"@types/node@^18.0.0":
34+
version "18.0.1"
35+
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.1.tgz#e91bd73239b338557a84d1f67f7b9e0f25643870"
36+
integrity sha512-CmR8+Tsy95hhwtZBKJBs0/FFq4XX7sDZHlGGf+0q+BRZfMbOTkzkj0AFAuTyXbObDIoanaBBW0+KEW+m3N16Wg==
37+
3338
"@types/vscode@^1.68.0":
34-
version "1.68.0"
35-
resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.68.0.tgz#c0864e4ea43c509bfc6b53f4e91aa923fd0475b8"
36-
integrity sha512-duBwEK5ta/eBBMJMQ7ECMEsMvlE3XJdRGh3xoS1uOO4jl2Z4LPBl5vx8WvBP10ERAgDRmIt/FaSD4RHyBGbChw==
39+
version "1.68.1"
40+
resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.68.1.tgz#a9e5b33f825f715cae80593cb6d5d6d4cabbe998"
41+
integrity sha512-fXlaq13NT5yHh6yZ3c+UxXloTSk34mIvsNFYyQCeO5Po2BLFAwz7EZT4kQ43B64/aPcnAenyWy3QasrTofBOnQ==
3742

3843
"@ungap/promise-all-settled@1.1.2":
3944
version "1.1.2"
@@ -1333,32 +1338,32 @@ vsce@^2.9.2:
13331338
yauzl "^2.3.1"
13341339
yazl "^2.2.2"
13351340

1336-
vscode-jsonrpc@8.0.1:
1337-
version "8.0.1"
1338-
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz#f30b0625ebafa0fb3bc53e934ca47b706445e57e"
1339-
integrity sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==
1341+
vscode-jsonrpc@8.0.2-next.1:
1342+
version "8.0.2-next.1"
1343+
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2-next.1.tgz#6bdc39fd194782032e34047eeefce562941259c6"
1344+
integrity sha512-sbbvGSWja7NVBLHPGawtgezc8DHYJaP4qfr/AaJiyDapWcSFtHyPtm18+LnYMLTmB7bhOUW/lf5PeeuLpP6bKA==
13401345

1341-
vscode-languageclient@^8.0.1:
1342-
version "8.0.1"
1343-
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.0.1.tgz#bf5535c4463a78daeaca0bcb4f5868aec86bb301"
1344-
integrity sha512-9XoE+HJfaWvu7Y75H3VmLo5WLCtsbxEgEhrLPqwt7eyoR49lUIyyrjb98Yfa50JCMqF2cePJAEVI6oe2o1sIhw==
1346+
vscode-languageclient@8.0.2-next.5:
1347+
version "8.0.2-next.5"
1348+
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.0.2-next.5.tgz#3238a388585c3119e247f761b4355273cc2fd909"
1349+
integrity sha512-g87RJLHz0XlRyk6DOTbAk4JHcj8CKggXy4JiFL7OlhETkcYzTOR8d+Qdb4GqZr37PDs1Cl21omtTNK5LyR/RQg==
13451350
dependencies:
13461351
minimatch "^3.0.4"
13471352
semver "^7.3.5"
1348-
vscode-languageserver-protocol "3.17.1"
1353+
vscode-languageserver-protocol "3.17.2-next.6"
13491354

1350-
vscode-languageserver-protocol@3.17.1:
1351-
version "3.17.1"
1352-
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz#e801762c304f740208b6c804a0cf21f2c87509ed"
1353-
integrity sha512-BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg==
1355+
vscode-languageserver-protocol@3.17.2-next.6:
1356+
version "3.17.2-next.6"
1357+
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2-next.6.tgz#8f1dc0fcb29366b85f623a3f9af726de433b5fcc"
1358+
integrity sha512-WtsebNOOkWyNn4oFYoAMPC8Q/ZDoJ/K7Ja53OzTixiitvrl/RpXZETrtzH79R8P5kqCyx6VFBPb6KQILJfkDkA==
13541359
dependencies:
1355-
vscode-jsonrpc "8.0.1"
1356-
vscode-languageserver-types "3.17.1"
1360+
vscode-jsonrpc "8.0.2-next.1"
1361+
vscode-languageserver-types "3.17.2-next.2"
13571362

1358-
vscode-languageserver-types@3.17.1:
1359-
version "3.17.1"
1360-
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz#c2d87fa7784f8cac389deb3ff1e2d9a7bef07e16"
1361-
integrity sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ==
1363+
vscode-languageserver-types@3.17.2-next.2:
1364+
version "3.17.2-next.2"
1365+
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2-next.2.tgz#af5d6978eee7682aab87c1419323f5b141ac6596"
1366+
integrity sha512-TiAkLABgqkVWdAlC3XlOfdhdjIAdVU4YntPUm9kKGbXr+MGwpVnKz2KZMNBcvG0CFx8Hi8qliL0iq+ndPB720w==
13621367

13631368
which@2.0.2:
13641369
version "2.0.2"

0 commit comments

Comments
 (0)