Skip to content

Commit 91cf985

Browse files
committed
use new tcl codemirror package
1 parent fb2ef05 commit 91cf985

4 files changed

Lines changed: 106 additions & 4 deletions

File tree

packages/web/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
"@replit/codemirror-vim": "^6.2.1",
7272
"@sentry/nextjs": "^9",
7373
"@shopify/lang-jsonc": "^1.0.0",
74+
"@sourcebot/codemirror-lang-tcl": "^1.0.9",
7475
"@sourcebot/crypto": "workspace:*",
7576
"@sourcebot/db": "workspace:*",
7677
"@sourcebot/error": "workspace:*",

packages/web/src/ee/features/codeNav/components/symbolHoverPopup/symbolHoverTargetsExtension.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ const NODE_TYPES = [
4444
"FieldName",
4545
// PHP
4646
"ClassMemberName",
47-
"Name"
47+
"Name",
48+
// Tcl
49+
"ProcName",
50+
"ProcInvocation",
51+
"PackageName",
52+
"Variable"
4853
]
4954

5055
export const symbolHoverTargetsExtension = StateField.define<DecorationSet>({

packages/web/src/lib/codemirrorLanguage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import { sparql } from "codemirror-lang-sparql"; // 3rd party
3636
import { spreadsheet } from "codemirror-lang-spreadsheet"; // 3rd party
3737
import { sql } from "@codemirror/lang-sql";
3838
import { svelte } from "@replit/codemirror-lang-svelte"; // 3rd party
39+
import { tcl } from "@sourcebot/codemirror-lang-tcl";
3940
import { twig } from "@ssddanbrown/codemirror-lang-twig"; // 3rd party
4041
import { vue } from "@codemirror/lang-vue";
4142
import { wast } from "@codemirror/lang-wast";
@@ -93,7 +94,6 @@ import { shader } from "@codemirror/legacy-modes/mode/clike";
9394
import { shell } from "@codemirror/legacy-modes/mode/shell";
9495
import { squirrel } from "@codemirror/legacy-modes/mode/clike";
9596
import { swift } from "@codemirror/legacy-modes/mode/swift";
96-
import { tcl } from "@codemirror/legacy-modes/mode/tcl";
9797
import { textile } from "@codemirror/legacy-modes/mode/textile";
9898
import { stex } from "@codemirror/legacy-modes/mode/stex";
9999
import { toml } from "@codemirror/legacy-modes/mode/toml";
@@ -159,6 +159,7 @@ export const codemirrorLanguageMap = {
159159
"spreadsheet": spreadsheet(),
160160
"sql": sql(),
161161
"svelte": svelte(),
162+
"tcl": tcl(),
162163
"tsx": javascript({ jsx: true, typescript: true }),
163164
"twig": twig(),
164165
"typescript": javascript({ jsx: false, typescript: true }),
@@ -214,7 +215,6 @@ export const codemirrorLanguageMap = {
214215
"shell": StreamLanguage.define(shell),
215216
"squirrel": StreamLanguage.define(squirrel),
216217
"swift": StreamLanguage.define(swift),
217-
"tcl": StreamLanguage.define(tcl),
218218
"textile": StreamLanguage.define(textile),
219219
"stex": StreamLanguage.define(stex),
220220
"toml": StreamLanguage.define(toml),

yarn.lock

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,20 @@ __metadata:
340340
languageName: node
341341
linkType: hard
342342

343+
"@codemirror/highlight@npm:^0.19.0":
344+
version: 0.19.8
345+
resolution: "@codemirror/highlight@npm:0.19.8"
346+
dependencies:
347+
"@codemirror/language": "npm:^0.19.0"
348+
"@codemirror/rangeset": "npm:^0.19.0"
349+
"@codemirror/state": "npm:^0.19.3"
350+
"@codemirror/view": "npm:^0.19.39"
351+
"@lezer/common": "npm:^0.15.0"
352+
style-mod: "npm:^4.0.0"
353+
checksum: 10c0/64ee07946e102962339de7d2b1e10f0eb2588549650f681c63ec58b6c1223ed9ed800097d87d5c52150024b7070ba3a0b2b2e27c8913545f85e17c72c2cfff60
354+
languageName: node
355+
linkType: hard
356+
343357
"@codemirror/lang-angular@npm:^0.1.0":
344358
version: 0.1.4
345359
resolution: "@codemirror/lang-angular@npm:0.1.4"
@@ -661,6 +675,19 @@ __metadata:
661675
languageName: node
662676
linkType: hard
663677

678+
"@codemirror/language@npm:^0.19.0":
679+
version: 0.19.10
680+
resolution: "@codemirror/language@npm:0.19.10"
681+
dependencies:
682+
"@codemirror/state": "npm:^0.19.0"
683+
"@codemirror/text": "npm:^0.19.0"
684+
"@codemirror/view": "npm:^0.19.0"
685+
"@lezer/common": "npm:^0.15.5"
686+
"@lezer/lr": "npm:^0.15.0"
687+
checksum: 10c0/aaa1a413fde7913cbe07d5ff66e634a9261214afc76e776d4eb68c7c7f6179988c27d842091bbab28059ff64027f23b492a9d976bf0e5396b1dbecdd9bd9c444
688+
languageName: node
689+
linkType: hard
690+
664691
"@codemirror/legacy-modes@npm:^6.4.0":
665692
version: 6.5.1
666693
resolution: "@codemirror/legacy-modes@npm:6.5.1"
@@ -690,6 +717,15 @@ __metadata:
690717
languageName: node
691718
linkType: hard
692719

720+
"@codemirror/rangeset@npm:^0.19.0, @codemirror/rangeset@npm:^0.19.5":
721+
version: 0.19.9
722+
resolution: "@codemirror/rangeset@npm:0.19.9"
723+
dependencies:
724+
"@codemirror/state": "npm:^0.19.0"
725+
checksum: 10c0/40fc64994f8020f29c224f4f5a5f83b4cb46252f14ec3837258e3fa27228df59fb891d67f0b42bf873b07543f3965b2e6d5a5ea567481792c904b0031b041236
726+
languageName: node
727+
linkType: hard
728+
693729
"@codemirror/search@npm:^6.0.0, @codemirror/search@npm:^6.5.6":
694730
version: 6.5.10
695731
resolution: "@codemirror/search@npm:6.5.10"
@@ -701,6 +737,15 @@ __metadata:
701737
languageName: node
702738
linkType: hard
703739

740+
"@codemirror/state@npm:^0.19.0, @codemirror/state@npm:^0.19.3":
741+
version: 0.19.9
742+
resolution: "@codemirror/state@npm:0.19.9"
743+
dependencies:
744+
"@codemirror/text": "npm:^0.19.0"
745+
checksum: 10c0/b2107e86ab31f4ccd81f2c7848761f6cfaefdc5a215bace692917a9352c44662645535593119c75af2c850de6359771c03ebb8b6366986431a11a1195358d7af
746+
languageName: node
747+
linkType: hard
748+
704749
"@codemirror/state@npm:^6.0.0, @codemirror/state@npm:^6.1.1, @codemirror/state@npm:^6.4.0, @codemirror/state@npm:^6.4.1, @codemirror/state@npm:^6.5.0":
705750
version: 6.5.2
706751
resolution: "@codemirror/state@npm:6.5.2"
@@ -710,6 +755,13 @@ __metadata:
710755
languageName: node
711756
linkType: hard
712757

758+
"@codemirror/text@npm:^0.19.0":
759+
version: 0.19.6
760+
resolution: "@codemirror/text@npm:0.19.6"
761+
checksum: 10c0/2c7cf96116e704e0126e4105f5a91b5feda1c9b403de47bb40ef9e650af2e38a1ba5d8f8e40725e8756260589e41337d1f815f634307adf5cd6df4bf95b61718
762+
languageName: node
763+
linkType: hard
764+
713765
"@codemirror/theme-one-dark@npm:^6.0.0":
714766
version: 6.1.2
715767
resolution: "@codemirror/theme-one-dark@npm:6.1.2"
@@ -722,6 +774,19 @@ __metadata:
722774
languageName: node
723775
linkType: hard
724776

777+
"@codemirror/view@npm:^0.19.0, @codemirror/view@npm:^0.19.39":
778+
version: 0.19.48
779+
resolution: "@codemirror/view@npm:0.19.48"
780+
dependencies:
781+
"@codemirror/rangeset": "npm:^0.19.5"
782+
"@codemirror/state": "npm:^0.19.3"
783+
"@codemirror/text": "npm:^0.19.0"
784+
style-mod: "npm:^4.0.0"
785+
w3c-keyname: "npm:^2.2.4"
786+
checksum: 10c0/360893303540878a616b8db85990d58790ba4f7cceda1dd55383a0d49aa733a5f0a1831f31ec12e8419ebf307cc7b47f9b6fa9ddccaed970bcc37174f72f61c0
787+
languageName: node
788+
linkType: hard
789+
725790
"@codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0, @codemirror/view@npm:^6.27.0, @codemirror/view@npm:^6.33.0, @codemirror/view@npm:^6.35.0":
726791
version: 6.36.4
727792
resolution: "@codemirror/view@npm:6.36.4"
@@ -1805,6 +1870,13 @@ __metadata:
18051870
languageName: node
18061871
linkType: hard
18071872

1873+
"@lezer/common@npm:^0.15.0, @lezer/common@npm:^0.15.5":
1874+
version: 0.15.12
1875+
resolution: "@lezer/common@npm:0.15.12"
1876+
checksum: 10c0/ed9cbeeee81e4da94a4fba735caddb6aa5d1908a4b2a95737b35492a2b0ec220be792ef7b2d302914904b3d9fa7307f43e8b627973e10b04cd1c1a88e5647622
1877+
languageName: node
1878+
linkType: hard
1879+
18081880
"@lezer/common@npm:^1.0.0, @lezer/common@npm:^1.0.2, @lezer/common@npm:^1.0.3, @lezer/common@npm:^1.1.0, @lezer/common@npm:^1.2.0, @lezer/common@npm:^1.2.1":
18091881
version: 1.2.3
18101882
resolution: "@lezer/common@npm:1.2.3"
@@ -1898,6 +1970,15 @@ __metadata:
18981970
languageName: node
18991971
linkType: hard
19001972

1973+
"@lezer/lr@npm:^0.15.0":
1974+
version: 0.15.8
1975+
resolution: "@lezer/lr@npm:0.15.8"
1976+
dependencies:
1977+
"@lezer/common": "npm:^0.15.0"
1978+
checksum: 10c0/5cd5123aca5cb2f268d265b6c21922ba3426ba60b9bbc1df85f4bfeed48097a444c656e642557fa93de8a8eb00d3254f502ce2796ae9edc1d186f14fa540a863
1979+
languageName: node
1980+
linkType: hard
1981+
19011982
"@lezer/lr@npm:^1.0.0, @lezer/lr@npm:^1.1.0, @lezer/lr@npm:^1.3.0, @lezer/lr@npm:^1.3.1, @lezer/lr@npm:^1.3.10, @lezer/lr@npm:^1.3.3, @lezer/lr@npm:^1.3.7, @lezer/lr@npm:^1.4.0, @lezer/lr@npm:^1.4.2, @lezer/lr@npm:^1.x":
19021983
version: 1.4.2
19031984
resolution: "@lezer/lr@npm:1.4.2"
@@ -5799,6 +5880,20 @@ __metadata:
57995880
languageName: unknown
58005881
linkType: soft
58015882

5883+
"@sourcebot/codemirror-lang-tcl@npm:^1.0.9":
5884+
version: 1.0.9
5885+
resolution: "@sourcebot/codemirror-lang-tcl@npm:1.0.9"
5886+
dependencies:
5887+
"@codemirror/highlight": "npm:^0.19.0"
5888+
"@codemirror/language": "npm:^6.0.0"
5889+
"@lezer/common": "npm:^1.0.0"
5890+
"@lezer/highlight": "npm:^1.0.0"
5891+
"@lezer/lr": "npm:^1.0.0"
5892+
tslib: "npm:^2.8.1"
5893+
checksum: 10c0/40b5b6ed60decfdfe495513242828585b1849cfd2ad70c8289811b6624225c0e219a5eb685ab107784d2ef8231a0eb9c9c31dd32fd3e909ea5b37864066c602c
5894+
languageName: node
5895+
linkType: hard
5896+
58025897
"@sourcebot/crypto@workspace:*, @sourcebot/crypto@workspace:packages/crypto":
58035898
version: 0.0.0-use.local
58045899
resolution: "@sourcebot/crypto@workspace:packages/crypto"
@@ -5967,6 +6062,7 @@ __metadata:
59676062
"@replit/codemirror-vim": "npm:^6.2.1"
59686063
"@sentry/nextjs": "npm:^9"
59696064
"@shopify/lang-jsonc": "npm:^1.0.0"
6065+
"@sourcebot/codemirror-lang-tcl": "npm:^1.0.9"
59706066
"@sourcebot/crypto": "workspace:*"
59716067
"@sourcebot/db": "workspace:*"
59726068
"@sourcebot/error": "workspace:*"
@@ -15795,7 +15891,7 @@ __metadata:
1579515891
languageName: node
1579615892
linkType: hard
1579715893

15798-
"tslib@npm:^2.0.0, tslib@npm:^2.1.0, tslib@npm:^2.4.0":
15894+
"tslib@npm:^2.0.0, tslib@npm:^2.1.0, tslib@npm:^2.4.0, tslib@npm:^2.8.1":
1579915895
version: 2.8.1
1580015896
resolution: "tslib@npm:2.8.1"
1580115897
checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62

0 commit comments

Comments
 (0)