Skip to content

Commit c597163

Browse files
SuperAugusteSuperAuguste
committed
Fix yarn issues, mention yarn version
1 parent b238c58 commit c597163

File tree

5 files changed

+2980
-4792
lines changed

5 files changed

+2980
-4792
lines changed

‎Development.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Developing scip-typescript
22

3+
Please note that the yarn version used by CI is `v1.22.19` - you should use this version as well to prevent lockfile conflicts.
4+
35
## References
46

57
- VS Code is a good reference point for the "correct" behavior

‎snapshots/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"input/*"
99
],
1010
"dependencies": {
11-
"@sourcegraph/tsconfig": "4.0.1",
12-
"react": "18.0.0"
11+
"react": "18.0.0",
12+
"@sourcegraph/tsconfig": "4.0.1"
1313
},
1414
"devDependencies": {
1515
"@types/react": "17.0.52"

‎snapshots/yarn.lock

Lines changed: 43 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,51 @@
1-
# This file is generated by running "yarn install" inside your project.
2-
# Manual changes might be lost - proceed with caution!
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
33

4-
__metadata:
5-
version: 6
6-
cacheKey: 8
74

8-
"@example/a@workspace:input/multi-project/packages/a":
9-
version: 0.0.0-use.local
10-
resolution: "@example/a@workspace:input/multi-project/packages/a"
11-
languageName: unknown
12-
linkType: soft
5+
"@sourcegraph/tsconfig@4.0.1":
6+
version "4.0.1"
7+
resolved "https://registry.yarnpkg.com/@sourcegraph/tsconfig/-/tsconfig-4.0.1.tgz#5965ec41771d2ac5b23b6e0d919cee3e70485840"
8+
integrity sha512-G/xsejsR84G5dj3kHJ7svKBo9E5tWl96rUHKP94Y2UDtA7BzUhAYbieM+b9ZUpIRt66h3+MlYbG5HK4UI2zDzw==
139

14-
"@example/b@workspace:input/multi-project/packages/b":
15-
version: 0.0.0-use.local
16-
resolution: "@example/b@workspace:input/multi-project/packages/b"
17-
languageName: unknown
18-
linkType: soft
10+
"@types/prop-types@*":
11+
version "15.7.4"
12+
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
13+
integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
1914

20-
"@sourcegraph/tsconfig@npm:4.0.1":
21-
version: 4.0.1
22-
resolution: "@sourcegraph/tsconfig@npm:4.0.1"
23-
checksum: cd552b47dcf27b59e944dee20ff29e8f96b77c956bc96c7db44910217fb1c978ff410add86c92ff242274f91484b59b27be4980aea25c77fd922b3c5e31f5d05
24-
languageName: node
25-
linkType: hard
26-
27-
"@types/prop-types@npm:*":
28-
version: 15.7.4
29-
resolution: "@types/prop-types@npm:15.7.4"
30-
checksum: ef6e1899e59b876c273811b1bd845022fc66d5a3d11cb38a25b6c566b30514ae38fe20a40f67622f362a4f4f7f9224e22d8da101cff3d6e97e11d7b4c307cfc1
31-
languageName: node
32-
linkType: hard
33-
34-
"@types/react@npm:17.0.52":
35-
version: 17.0.52
36-
resolution: "@types/react@npm:17.0.52"
37-
dependencies:
38-
"@types/prop-types": "*"
39-
"@types/scheduler": "*"
40-
csstype: ^3.0.2
41-
checksum: a51b98dd87838d161278fdf9dd78e6a4ff8c018f406d6647f77963e144fb52a8beee40c89fd0e7e840eaeaa8bd9fe2f34519410540b1a52d43a6f8b4d2fbce33
42-
languageName: node
43-
linkType: hard
44-
45-
"@types/scheduler@npm:*":
46-
version: 0.16.2
47-
resolution: "@types/scheduler@npm:0.16.2"
48-
checksum: b6b4dcfeae6deba2e06a70941860fb1435730576d3689225a421280b7742318d1548b3d22c1f66ab68e414f346a9542f29240bc955b6332c5b11e561077583bc
49-
languageName: node
50-
linkType: hard
51-
52-
"csstype@npm:^3.0.2":
53-
version: 3.0.11
54-
resolution: "csstype@npm:3.0.11"
55-
checksum: 95e56abfe9ca219ae065acb4e43f61771a03170eed919127f558dfa168240867aba7629c8d98a201a0dd06d9a5ce82686f0570031c928516c61816adbc7c877f
56-
languageName: node
57-
linkType: hard
58-
59-
"invalid-package-json@workspace:input/invalid-package-json":
60-
version: 0.0.0-use.local
61-
resolution: "invalid-package-json@workspace:input/invalid-package-json"
62-
languageName: unknown
63-
linkType: soft
64-
65-
"js-tokens@npm:^3.0.0 || ^4.0.0":
66-
version: 4.0.0
67-
resolution: "js-tokens@npm:4.0.0"
68-
checksum: 8a95213a5a77deb6cbe94d86340e8d9ace2b93bc367790b260101d2f36a2eaf4e4e22d9fa9cf459b38af3a32fb4190e638024cf82ec95ef708680e405ea7cc78
69-
languageName: node
70-
linkType: hard
71-
72-
"loose-envify@npm:^1.1.0":
73-
version: 1.4.0
74-
resolution: "loose-envify@npm:1.4.0"
15+
"@types/react@17.0.52":
16+
version "17.0.52"
17+
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.52.tgz#10d8b907b5c563ac014a541f289ae8eaa9bf2e9b"
18+
integrity sha512-vwk8QqVODi0VaZZpDXQCmEmiOuyjEFPY7Ttaw5vjM112LOq37yz1CDJGrRJwA1fYEq4Iitd5rnjd1yWAc/bT+A==
7519
dependencies:
76-
js-tokens: ^3.0.0 || ^4.0.0
77-
bin:
78-
loose-envify: cli.js
79-
checksum: 6517e24e0cad87ec9888f500c5b5947032cdfe6ef65e1c1936a0c48a524b81e65542c9c3edc91c97d5bddc806ee2a985dbc79be89215d613b1de5db6d1cfe6f4
80-
languageName: node
81-
linkType: hard
82-
83-
"multi-project@workspace:input/multi-project":
84-
version: 0.0.0-use.local
85-
resolution: "multi-project@workspace:input/multi-project"
86-
languageName: unknown
87-
linkType: soft
88-
89-
"pnpm-workspaces@workspace:input/pnpm-workspaces":
90-
version: 0.0.0-use.local
91-
resolution: "pnpm-workspaces@workspace:input/pnpm-workspaces"
92-
languageName: unknown
93-
linkType: soft
94-
95-
"pure-js@workspace:input/pure-js":
96-
version: 0.0.0-use.local
97-
resolution: "pure-js@workspace:input/pure-js"
98-
languageName: unknown
99-
linkType: soft
100-
101-
"react-example@workspace:input/react":
102-
version: 0.0.0-use.local
103-
resolution: "react-example@workspace:input/react"
104-
languageName: unknown
105-
linkType: soft
106-
107-
"react@npm:18.0.0":
108-
version: 18.0.0
109-
resolution: "react@npm:18.0.0"
20+
"@types/prop-types" "*"
21+
"@types/scheduler" "*"
22+
csstype "^3.0.2"
23+
24+
"@types/scheduler@*":
25+
version "0.16.2"
26+
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
27+
integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
28+
29+
csstype@^3.0.2:
30+
version "3.0.11"
31+
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
32+
integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
33+
34+
"js-tokens@^3.0.0 || ^4.0.0":
35+
version "4.0.0"
36+
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
37+
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
38+
39+
loose-envify@^1.1.0:
40+
version "1.4.0"
41+
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
42+
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
11043
dependencies:
111-
loose-envify: ^1.1.0
112-
checksum: 293020b96536b3c7113ee57ca5c990a3f25649d1751b1c7a3aabd16dff0691fe9f1eed1206616d0906d05933536052037340a0c8d0941ff870b0eb469a2f975b
113-
languageName: node
114-
linkType: hard
44+
js-tokens "^3.0.0 || ^4.0.0"
11545

116-
"snapshots@workspace:.":
117-
version: 0.0.0-use.local
118-
resolution: "snapshots@workspace:."
46+
react@18.0.0:
47+
version "18.0.0"
48+
resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"
49+
integrity sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A==
11950
dependencies:
120-
"@sourcegraph/tsconfig": 4.0.1
121-
"@types/react": 17.0.52
122-
react: 18.0.0
123-
languageName: unknown
124-
linkType: soft
125-
126-
"syntax@workspace:input/syntax":
127-
version: 0.0.0-use.local
128-
resolution: "syntax@workspace:input/syntax"
129-
languageName: unknown
130-
linkType: soft
51+
loose-envify "^1.1.0"

‎src/FileIndexer.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ export class FileIndexer {
113113

114114
private hasConstructor(classDeclaration: ts.ClassDeclaration): boolean {
115115
const cached = this.globalConstructorTable.get(classDeclaration)
116-
if (cached !== undefined) return cached
116+
if (cached !== undefined) {
117+
return cached
118+
}
117119

118120
for (const member of classDeclaration.members) {
119121
if (ts.isConstructorDeclaration(member)) {
@@ -552,7 +554,7 @@ export class FileIndexer {
552554
case ts.ScriptElementKind.classElement:
553555
case ts.ScriptElementKind.localClassElement:
554556
if (ts.isConstructorDeclaration(node)) {
555-
return 'constructor' + signature()!
557+
return 'constructor' + (signature() || '')
556558
}
557559
return 'class ' + node.getText()
558560
case ts.ScriptElementKind.interfaceElement:

0 commit comments

Comments
 (0)