Skip to content

Commit 89a1b42

Browse files
committed
Errors are red.
1 parent ccdee96 commit 89a1b42

1 file changed

Lines changed: 15 additions & 15 deletions

File tree

pi-extensions/nateclipse.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export default function (pi: ExtensionAPI) {
7474
else msg += `\nWith -E: 0 matches`;
7575
}
7676
}
77-
return result(msg, { files });
77+
throw new Error(msg);
7878
}
7979
const rawLines = output.split("\n").filter((l: string) => l.length > 0);
8080
const cleaned = rawLines.map((l: string) => l.replace(/^(\d+):/, "$1 ")).join("\n");
@@ -113,11 +113,11 @@ export default function (pi: ExtensionAPI) {
113113
},
114114
async execute(_id, params, signal, _onUpdate, ctx) {
115115
const data = await jdt("/java_members", params, signal);
116-
if (data._error) return result(data._error + ": " + params.type);
116+
if (data._error) throw new Error(data._error + ": " + params.type);
117117
const entries = data.entries || [];
118118
if (!entries.length) {
119119
const msg = data.warning || "Type has no members: " + params.type;
120-
return result(msg, { data });
120+
throw new Error(msg);
121121
}
122122
const parts: string[] = [];
123123
for (let i = 0; i < entries.length; i++) {
@@ -209,9 +209,9 @@ export default function (pi: ExtensionAPI) {
209209
},
210210
async execute(_id, params, signal, _onUpdate, ctx) {
211211
const data = await jdt("/java_type", params, signal);
212-
if (data._error) return result(data._error);
212+
if (data._error) throw new Error(data._error);
213213
const matches = data.matches || [];
214-
if (matches.length === 0) return result("No matching types for: " + params.type);
214+
if (matches.length === 0) throw new Error("No matching types for: " + params.type);
215215
if (matches.length === 1 && matches[0].source != null) {
216216
const m = matches[0];
217217
const path = relPath(m.file, ctx.cwd);
@@ -271,7 +271,7 @@ export default function (pi: ExtensionAPI) {
271271
},
272272
async execute(_id, params, signal, _onUpdate, ctx) {
273273
const data = await jdt("/java_method", params, signal);
274-
if (data._error) return result(data._error);
274+
if (data._error) throw new Error(data._error);
275275
const parts: string[] = [];
276276
if (data.file) parts.push(`${relPath(data.file, ctx.cwd)}` + (data.line ? `:${data.line}` : "") + (data.endLine ? `-${data.endLine}` : ""));
277277
parts.push(data.source);
@@ -331,7 +331,7 @@ export default function (pi: ExtensionAPI) {
331331
const serverParams: any = { ...params };
332332
if (!params.type) serverParams.file = path.resolve(ctx.cwd, params.file);
333333
const data = await jdt("/java_organize_imports", serverParams, signal);
334-
if (data._error) return result(data._error + ": " + (params.type || params.file));
334+
if (data._error) throw new Error(data._error + ": " + (params.type || params.file));
335335
if (data.organized) return result("Success");
336336
const lines = ["Ambiguous imports, call again with resolve parameter:"];
337337
for (const c of data.conflicts)
@@ -368,7 +368,7 @@ export default function (pi: ExtensionAPI) {
368368
},
369369
async execute(_id, params, signal, _onUpdate, ctx) {
370370
const data = await jdt("/java_errors", params, signal);
371-
if (data._error) return result(data._error);
371+
if (data._error) throw new Error(data._error);
372372
if (data.total === 0) return result("None");
373373
const text = groupByFile(data.errors, ctx.cwd, (e) => {
374374
let s = ` :${e.line} ${e.severity}: ${e.message}`;
@@ -415,10 +415,10 @@ export default function (pi: ExtensionAPI) {
415415
},
416416
async execute(_id, params, signal, _onUpdate, ctx) {
417417
const data = await jdt("/java_references", params, signal);
418-
if (data._error) return result(data._error);
418+
if (data._error) throw new Error(data._error);
419419
if (data.total === 0) {
420420
const msg = data.warning || "No references for: " + typePlain(params);
421-
return result(msg, { data });
421+
throw new Error(msg);
422422
}
423423
const text = groupByFile(data.references, ctx.cwd, (r) => {
424424
let s = `${r.line}`;
@@ -474,11 +474,11 @@ export default function (pi: ExtensionAPI) {
474474
},
475475
async execute(_id, params, signal, _onUpdate, ctx) {
476476
const data = await jdt("/java_hierarchy", params, signal);
477-
if (data._error) return result(data._error);
477+
if (data._error) throw new Error(data._error);
478478
const types = data.types || [];
479479
if (types.length === 0) {
480480
const msg = data.warning || "No types in hierarchy for: " + typePlain(params);
481-
return result(msg, { data });
481+
throw new Error(msg);
482482
}
483483
const lines = types.map((t: any) => {
484484
let s = t.type;
@@ -524,10 +524,10 @@ export default function (pi: ExtensionAPI) {
524524
},
525525
async execute(_id, params, signal, _onUpdate, ctx) {
526526
const data = await jdt("/java_callers", params, signal);
527-
if (data._error) return result(data._error);
527+
if (data._error) throw new Error(data._error);
528528
if (data.total === 0) {
529529
const msg = data.warning || "No callers for: " + typePlain(params);
530-
return result(msg, { data });
530+
throw new Error(msg);
531531
}
532532
const text = groupByFile(data.callers, ctx.cwd, (r) => {
533533
let s = `${r.line}`;
@@ -574,7 +574,7 @@ export default function (pi: ExtensionAPI) {
574574
},
575575
async execute(_id, params, signal) {
576576
const data = await jdt("/java_classpath", params, signal);
577-
if (data._error) return result(data._error + ": " + params.project);
577+
if (data._error) throw new Error(data._error + ": " + params.project);
578578
return result(data.file, { data });
579579
},
580580
renderResult(r, { isPartial }, theme) {

0 commit comments

Comments
 (0)