Skip to content
This repository was archived by the owner on Feb 28, 2026. It is now read-only.

Throw more detailed error when compilation fails #18783

Merged
Charles-Gagnon merged 2 commits into from
Mar 24, 2022
Merged

Throw more detailed error when compilation fails #18783

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28e3d97
Throw more detailed error when compilation fails
Charles-Gagnon Mar 18, 2022
e7d0aff
Add SQL edits
Charles-Gagnon Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/vs/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,12 @@ var AMDLoader;
catch (_e) {
recorder.record(61 /* CachedDataMissed */, cachedDataPath);
}
var script = new that._vm.Script(scriptSource, options);
var script;
Copy link
Copy Markdown
Contributor

@alanrenmsft alanrenmsft Mar 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sql carbon edit comments?

Copy link
Copy Markdown
Contributor Author

@Charles-Gagnon Charles-Gagnon Mar 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh right, let me wait and see if they accept my PR first.

Copy link
Copy Markdown
Contributor Author

@Charles-Gagnon Charles-Gagnon Mar 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No word from them yet so just going to get this in and we can remove it later if they accept the change.

try {
script = new that._vm.Script(scriptSource, options);
} catch (err) {
throw new Error(`Error compiling ${filename}. ${err}`);
}
var compileWrapper = script.runInThisContext(options);
// run script
var dirname = that._path.dirname(filename);
Expand Down Expand Up @@ -852,7 +857,12 @@ var AMDLoader;
NodeScriptLoader.prototype._createAndEvalScript = function (moduleManager, contents, options, callback, errorback) {
var recorder = moduleManager.getRecorder();
recorder.record(31 /* NodeBeginEvaluatingScript */, options.filename);
var script = new this._vm.Script(contents, options);
var script;
try {
script = new this._vm.Script(contents, options);
} catch (err) {
throw new Error(`Error compiling ${options.filename}. ${err}`);
}
var ret = script.runInThisContext(options);
var globalDefineFunc = moduleManager.getGlobalAMDDefineFunc();
var receivedDefineCall = false;
Expand Down