language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-09-28 13:14:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move //libdeno to //core/libdeno (#2015)

Browse source 
Fixes some sed errors introduced in c43cfe.

Unfortunately moving libdeno required splitting build.rs into two parts,
one for cli and one for core.

I've also removed the arm64 build - it's complicating things at this
re-org and we're not even testing it. I need to swing back to it and get
tools/test.py running for it.
This commit is contained in:
Ryan Dahl 2019-03-30 14:45:36 -04:00 • committed by GitHub
parent ad3cbc50fb
commit c9614d86c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
74 changed files with 604 additions and 602 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cli/js_errors.rs
View file

@ -64,9 +64,9 @@ impl<'a> fmt::Display for JSErrorColor<'a> {
let e = self.0;
if e.script_resource_name.is_some() {
let script_resource_name = e.script_resource_name.as_ref().unwrap();
// Avoid showing internal code from gen/bundle/main.js
if script_resource_name != "gen/bundle/main.js"
&& script_resource_name != "gen/bundle/compiler.js"
// Avoid showing internal code from gen/cli/bundle/main.js
if script_resource_name != "gen/cli/bundle/main.js"
&& script_resource_name != "gen/cli/bundle/compiler.js"
{
if e.line_number.is_some() && e.start_column.is_some() {
assert!(e.line_number.is_some());
@ -216,14 +216,16 @@ fn builtin_source_map(_: &str) -> Option<Vec<u8>> {
#[cfg(not(feature = "check-only"))]
fn builtin_source_map(script_name: &str) -> Option<Vec<u8>> {
match script_name {
"gen/bundle/main.js" => Some(
include_bytes!(concat!(env!("GN_OUT_DIR"), "/gen/bundle/main.js.map"))
.to_vec(),
),
"gen/bundle/compiler.js" => Some(
"gen/cli/bundle/main.js" => Some(
include_bytes!(concat!(
env!("GN_OUT_DIR"),
"/gen/bundle/compiler.js.map"
"/gen/cli/bundle/main.js.map"
)).to_vec(),
),
"gen/cli/bundle/compiler.js" => Some(
include_bytes!(concat!(
env!("GN_OUT_DIR"),
"/gen/cli/bundle/compiler.js.map"
)).to_vec(),
),
_ => None,
@ -381,7 +383,7 @@ mod tests {
frames: vec![StackFrame {
line: 11,
column: 12,
script_name: "gen/bundle/main.js".to_string(),
script_name: "gen/cli/bundle/main.js".to_string(),
function_name: "setLogDebug".to_string(),
is_eval: false,
is_constructor: false,