Refine compile/run error messages

64json · 64json · commit 84a972c8aa3f · 2018-08-09T01:24:30.000+09:00
diff --git a/src/backend/common/util.js b/src/backend/common/util.js
@@ -4,7 +4,7 @@ import child_process from 'child_process';
 const execute = (command, cwd, { stdout = process.stdout, stderr = process.stderr } = {}) => new Promise((resolve, reject) => {
   if (!cwd) return reject(new Error('CWD Not Specified'));
   const child = child_process.exec(command, { cwd }, (error, stdout, stderr) => {
-    if (error) return reject(new Error(stderr));
+    if (error) return reject(error.code ? new Error(stderr) : error);
     resolve(stdout);
   });
   if (stdout) child.stdout.pipe(stdout);
@@ -13,4 +13,4 @@ const execute = (command, cwd, { stdout = process.stdout, stderr = process.stder
 
 export {
   execute,
-};
+};
diff --git a/src/backend/controllers/tracers.js b/src/backend/controllers/tracers.js
@@ -29,13 +29,9 @@ const trace = lang => (req, res, next) => {
   const tempPath = getCodesPath(uuid.v4());
   fs.outputFile(path.resolve(tempPath, `Main.${lang}`), code)
     .then(() => execute(`LANG=${lang} TEMP_PATH=${tempPath} ./bin/compile`, repoPath, { stdout: null, stderr: null })
-      .catch(error => {
-        throw new CompileError(error);
-      }))
+      .catch(error => Promise.reject(new CompileError(error.message))))
     .then(() => execute(`LANG=${lang} TEMP_PATH=${tempPath} ./bin/run`, repoPath, { stdout: null, stderr: null })
-      .catch(error => {
-        throw new RuntimeError(error);
-      }))
+      .catch(error => Promise.reject(new RuntimeError(error.message))))
     .then(() => res.sendFile(path.resolve(tempPath, 'traces.json')))
     .catch(next)
     .finally(() => fs.remove(tempPath));
@@ -51,4 +47,4 @@ router.route('/java')
 router.route('/cpp')
   .post(trace('cpp'));
 
-export default router;
+export default router;
diff --git a/src/frontend/common/stylesheet/fonts.scss b/src/frontend/common/stylesheet/fonts.scss
@@ -0,0 +1,2 @@
+$font-family-normal: 'Roboto', sans-serif;
+$font-family-monospace: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
diff --git a/src/frontend/common/stylesheet/index.scss b/src/frontend/common/stylesheet/index.scss
@@ -1,2 +1,3 @@
 @import "colors";
-@import "dimensions";
+@import "dimensions";
+@import "fonts";
diff --git a/src/frontend/components/App/stylesheet.scss b/src/frontend/components/App/stylesheet.scss
@@ -10,7 +10,7 @@ body {
 }
 
 body {
-  font-family: 'Roboto', sans-serif;
+  font-family: $font-family-normal;
   -webkit-font-smoothing: subpixel-antialiased;
   user-select: none;
   color: $color-font;
diff --git a/src/frontend/components/ToastContainer/stylesheet.scss b/src/frontend/components/ToastContainer/stylesheet.scss
@@ -13,9 +13,9 @@
   border-radius: 4px;
   padding: 16px;
   margin: 8px;
-  font-size: $font-size-large;
-  white-space: pre-line;
+  white-space: pre-wrap;
   pointer-events: auto;
+  font-family: $font-family-monospace;
 
   &.success {
     border-color: rgb(0, 150, 0);
diff --git a/src/frontend/core/renderers/LogRenderer/stylesheet.scss b/src/frontend/core/renderers/LogRenderer/stylesheet.scss
@@ -7,6 +7,7 @@
   display: flex;
   flex-direction: column;
   overflow-y: auto;
+  font-family: $font-family-monospace;
 
   .message {
     margin: 2px 0;
diff --git a/src/frontend/core/renderers/Renderer/stylesheet.scss b/src/frontend/core/renderers/Renderer/stylesheet.scss
@@ -7,7 +7,6 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  font-family: 'Roboto Mono', monospace;
 
   &:first-child {
     border-top: none;
@@ -17,9 +16,9 @@
     position: absolute;
     top: 0;
     left: 0;
-    background-color: $color-shadow;
+    background-color: $theme-light;
     color: $color-font;
-    padding: 4px;
+    padding: 4px 6px;
     font-size: $font-size-large;
   }
 }
diff --git a/src/frontend/template.html b/src/frontend/template.html
@@ -18,7 +18,7 @@
     <meta name="theme-color" content="#393939">
     <link rel="shortcut icon" href="/favicon.png" type="image/png">
     <link rel="manifest" href="/manifest.json">
-    <link href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,700|Roboto:400,700" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Roboto:400,700" rel="stylesheet">
 </head>
 <body>
 <div id="root" style="height: 100%"></div>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+$font-family-normal: 'Roboto', sans-serif;`
	`2`	`+$font-family-monospace: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ body {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`body {`
`13`		`- font-family: 'Roboto', sans-serif;`
	`13`	`+ font-family: $font-family-normal;`
`14`	`14`	`-webkit-font-smoothing: subpixel-antialiased;`
`15`	`15`	`user-select: none;`
`16`	`16`	`color: $color-font;`