Skip to content

Commit 8998dc1

Browse files
CompuIvesCompuIves
committed
Fix type fetching
1 parent a3e20a1 commit 8998dc1

File tree

11 files changed

+303
-130
lines changed

11 files changed

+303
-130
lines changed

‎packages/codesandbox-api/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
},
7676
"devDependencies": {
7777
"@types/debug": "^0.0.30",
78+
"@types/glob": "^7.1.1",
7879
"@types/jest": "^20.0.0",
7980
"@types/uuid": "^3.4.3",
8081
"colors": "^1.1.2",

‎standalone-packages/monaco-typescript/release/dev/languageFeatures.js‎

Lines changed: 134 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,36 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
5757
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
5858
}
5959
};
60+
var __values = (this && this.__values) || function (o) {
61+
var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
62+
if (m) return m.call(o);
63+
return {
64+
next: function () {
65+
if (o && i >= o.length) o = void 0;
66+
return { value: o && o[i++], done: !o };
67+
}
68+
};
69+
};
70+
var __read = (this && this.__read) || function (o, n) {
71+
var m = typeof Symbol === "function" && o[Symbol.iterator];
72+
if (!m) return o;
73+
var i = m.call(o), r, ar = [], e;
74+
try {
75+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
76+
}
77+
catch (error) { e = { error: error }; }
78+
finally {
79+
try {
80+
if (r && !r.done && (m = i["return"])) m.call(i);
81+
}
82+
finally { if (e) throw e.error; }
83+
}
84+
return ar;
85+
};
86+
var __spread = (this && this.__spread) || function () {
87+
for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
88+
return ar;
89+
};
6090
define(["require", "exports", "./lib/emmet/expand/languageserver-types"], function (require, exports, ls) {
6191
/*---------------------------------------------------------------------------------------------
6292
* Copyright (c) Microsoft Corporation. All rights reserved.
@@ -204,18 +234,38 @@ define(["require", "exports", "./lib/emmet/expand/languageserver-types"], functi
204234
}));
205235
_this._disposables.push({
206236
dispose: function () {
207-
for (var _i = 0, _a = monaco.editor.getModels(); _i < _a.length; _i++) {
208-
var model = _a[_i];
209-
onModelRemoved(model);
237+
var e_1, _a;
238+
try {
239+
for (var _b = __values(monaco.editor.getModels()), _c = _b.next(); !_c.done; _c = _b.next()) {
240+
var model = _c.value;
241+
onModelRemoved(model);
242+
}
243+
}
244+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
245+
finally {
246+
try {
247+
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
248+
}
249+
finally { if (e_1) throw e_1.error; }
210250
}
211251
},
212252
});
213253
_this._disposables.push(_this._defaults.onDidChange(function () {
214-
// redo diagnostics when options change
215-
for (var _i = 0, _a = monaco.editor.getModels(); _i < _a.length; _i++) {
216-
var model = _a[_i];
217-
onModelRemoved(model);
218-
onModelAdd(model);
254+
var e_2, _a;
255+
try {
256+
// redo diagnostics when options change
257+
for (var _b = __values(monaco.editor.getModels()), _c = _b.next(); !_c.done; _c = _b.next()) {
258+
var model = _c.value;
259+
onModelRemoved(model);
260+
onModelAdd(model);
261+
}
262+
}
263+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
264+
finally {
265+
try {
266+
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
267+
}
268+
finally { if (e_2) throw e_2.error; }
219269
}
220270
}));
221271
monaco.editor.getModels().forEach(onModelAdd);
@@ -280,7 +330,7 @@ define(["require", "exports", "./lib/emmet/expand/languageserver-types"], functi
280330
}
281331
Object.defineProperty(SuggestAdapter.prototype, "triggerCharacters", {
282332
get: function () {
283-
return emmetTriggerCharacters.concat(['.']);
333+
return __spread(emmetTriggerCharacters, ['.']);
284334
},
285335
enumerable: true,
286336
configurable: true
@@ -543,28 +593,31 @@ define(["require", "exports", "./lib/emmet/expand/languageserver-types"], functi
543593
return worker.getDefinitionAtPosition(resource.toString(), _this._positionToOffset(resource, position));
544594
})
545595
.then(function (entries) { return __awaiter(_this, void 0, void 0, function () {
546-
var result, _i, entries_1, entry, uri, model_1;
547-
return __generator(this, function (_a) {
548-
switch (_a.label) {
596+
var e_3, _a, result, entries_1, entries_1_1, entry, uri, model_1, e_3_1;
597+
return __generator(this, function (_b) {
598+
switch (_b.label) {
549599
case 0:
550600
if (!entries) {
551601
return [2 /*return*/];
552602
}
553603
result = [];
554-
_i = 0, entries_1 = entries;
555-
_a.label = 1;
604+
_b.label = 1;
556605
case 1:
557-
if (!(_i < entries_1.length)) return [3 /*break*/, 5];
558-
entry = entries_1[_i];
606+
_b.trys.push([1, 7, 8, 9]);
607+
entries_1 = __values(entries), entries_1_1 = entries_1.next();
608+
_b.label = 2;
609+
case 2:
610+
if (!!entries_1_1.done) return [3 /*break*/, 6];
611+
entry = entries_1_1.value;
559612
uri = Uri.parse(entry.fileName);
560613
model_1 = void 0;
561-
if (!monaco.editor.resolveModel) return [3 /*break*/, 3];
614+
if (!monaco.editor.resolveModel) return [3 /*break*/, 4];
562615
return [4 /*yield*/, monaco.editor.resolveModel(uri)];
563-
case 2:
564-
// @ts-ignore
565-
model_1 = _a.sent();
566-
_a.label = 3;
567616
case 3:
617+
// @ts-ignore
618+
model_1 = _b.sent();
619+
_b.label = 4;
620+
case 4:
568621
if (monaco.editor.getModel(uri)) {
569622
result.push({
570623
uri: uri,
@@ -574,11 +627,22 @@ define(["require", "exports", "./lib/emmet/expand/languageserver-types"], functi
574627
if (model_1) {
575628
model_1.dispose();
576629
}
577-
_a.label = 4;
578-
case 4:
579-
_i++;
580-
return [3 /*break*/, 1];
581-
case 5: return [2 /*return*/, result];
630+
_b.label = 5;
631+
case 5:
632+
entries_1_1 = entries_1.next();
633+
return [3 /*break*/, 2];
634+
case 6: return [3 /*break*/, 9];
635+
case 7:
636+
e_3_1 = _b.sent();
637+
e_3 = { error: e_3_1 };
638+
return [3 /*break*/, 9];
639+
case 8:
640+
try {
641+
if (entries_1_1 && !entries_1_1.done && (_a = entries_1.return)) _a.call(entries_1);
642+
}
643+
finally { if (e_3) throw e_3.error; }
644+
return [7 /*endfinally*/];
645+
case 9: return [2 /*return*/, result];
582646
}
583647
});
584648
}); }));
@@ -600,28 +664,31 @@ define(["require", "exports", "./lib/emmet/expand/languageserver-types"], functi
600664
return worker.getReferencesAtPosition(resource.toString(), _this._positionToOffset(resource, position));
601665
})
602666
.then(function (entries) { return __awaiter(_this, void 0, void 0, function () {
603-
var result, _i, entries_2, entry, uri, model_2;
604-
return __generator(this, function (_a) {
605-
switch (_a.label) {
667+
var e_4, _a, result, entries_2, entries_2_1, entry, uri, model_2, e_4_1;
668+
return __generator(this, function (_b) {
669+
switch (_b.label) {
606670
case 0:
607671
if (!entries) {
608672
return [2 /*return*/];
609673
}
610674
result = [];
611-
_i = 0, entries_2 = entries;
612-
_a.label = 1;
675+
_b.label = 1;
613676
case 1:
614-
if (!(_i < entries_2.length)) return [3 /*break*/, 5];
615-
entry = entries_2[_i];
677+
_b.trys.push([1, 7, 8, 9]);
678+
entries_2 = __values(entries), entries_2_1 = entries_2.next();
679+
_b.label = 2;
680+
case 2:
681+
if (!!entries_2_1.done) return [3 /*break*/, 6];
682+
entry = entries_2_1.value;
616683
uri = Uri.parse(entry.fileName);
617684
model_2 = void 0;
618-
if (!monaco.editor.resolveModel) return [3 /*break*/, 3];
685+
if (!monaco.editor.resolveModel) return [3 /*break*/, 4];
619686
return [4 /*yield*/, monaco.editor.resolveModel(uri)];
620-
case 2:
621-
// @ts-ignore
622-
model_2 = _a.sent();
623-
_a.label = 3;
624687
case 3:
688+
// @ts-ignore
689+
model_2 = _b.sent();
690+
_b.label = 4;
691+
case 4:
625692
if (monaco.editor.getModel(uri)) {
626693
result.push({
627694
uri: uri,
@@ -631,11 +698,22 @@ define(["require", "exports", "./lib/emmet/expand/languageserver-types"], functi
631698
if (model_2) {
632699
model_2.dispose();
633700
}
634-
_a.label = 4;
635-
case 4:
636-
_i++;
637-
return [3 /*break*/, 1];
638-
case 5: return [2 /*return*/, result];
701+
_b.label = 5;
702+
case 5:
703+
entries_2_1 = entries_2.next();
704+
return [3 /*break*/, 2];
705+
case 6: return [3 /*break*/, 9];
706+
case 7:
707+
e_4_1 = _b.sent();
708+
e_4 = { error: e_4_1 };
709+
return [3 /*break*/, 9];
710+
case 8:
711+
try {
712+
if (entries_2_1 && !entries_2_1.done && (_a = entries_2.return)) _a.call(entries_2);
713+
}
714+
finally { if (e_4) throw e_4.error; }
715+
return [7 /*endfinally*/];
716+
case 9: return [2 /*return*/, result];
639717
}
640718
});
641719
}); }));
@@ -659,6 +737,7 @@ define(["require", "exports", "./lib/emmet/expand/languageserver-types"], functi
659737
return;
660738
}
661739
var convert = function (bucket, item, containerLabel) {
740+
var e_5, _a;
662741
var result = {
663742
name: item.text,
664743
detail: '',
@@ -669,9 +748,18 @@ define(["require", "exports", "./lib/emmet/expand/languageserver-types"], functi
669748
containerName: containerLabel,
670749
};
671750
if (item.childItems && item.childItems.length > 0) {
672-
for (var _i = 0, _a = item.childItems; _i < _a.length; _i++) {
673-
var child = _a[_i];
674-
convert(bucket, child, result.name);
751+
try {
752+
for (var _b = __values(item.childItems), _c = _b.next(); !_c.done; _c = _b.next()) {
753+
var child = _c.value;
754+
convert(bucket, child, result.name);
755+
}
756+
}
757+
catch (e_5_1) { e_5 = { error: e_5_1 }; }
758+
finally {
759+
try {
760+
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
761+
}
762+
finally { if (e_5) throw e_5.error; }
675763
}
676764
}
677765
bucket.push(result);

‎standalone-packages/monaco-typescript/release/dev/tsMode.js‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
var __read = (this && this.__read) || function (o, n) {
2+
var m = typeof Symbol === "function" && o[Symbol.iterator];
3+
if (!m) return o;
4+
var i = m.call(o), r, ar = [], e;
5+
try {
6+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
7+
}
8+
catch (error) { e = { error: error }; }
9+
finally {
10+
try {
11+
if (r && !r.done && (m = i["return"])) m.call(i);
12+
}
13+
finally { if (e) throw e.error; }
14+
}
15+
return ar;
16+
};
17+
var __spread = (this && this.__spread) || function () {
18+
for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
19+
return ar;
20+
};
121
define(["require", "exports", "./workerManager", "./languageFeatures"], function (require, exports, workerManager_1, languageFeatures) {
222
/*---------------------------------------------------------------------------------------------
323
* Copyright (c) Microsoft Corporation. All rights reserved.
@@ -40,7 +60,7 @@ define(["require", "exports", "./workerManager", "./languageFeatures"], function
4060
for (var _i = 1; _i < arguments.length; _i++) {
4161
more[_i - 1] = arguments[_i];
4262
}
43-
return client.getLanguageServiceWorker.apply(client, [first].concat(more));
63+
return client.getLanguageServiceWorker.apply(client, __spread([first].concat(more)));
4464
};
4565
monaco.languages.registerCompletionItemProvider(modeId, new languageFeatures.SuggestAdapter(worker));
4666
monaco.languages.registerSignatureHelpProvider(modeId, new languageFeatures.SignatureHelpAdapter(worker));

0 commit comments

Comments
 (0)