From 0b387f5b38c3d81e4fb2140bc360403138b08af5 Mon Sep 17 00:00:00 2001
From: utkarshgautamnyu <utkarsh.gautam@nyu.edu>
Date: Tue, 26 Sep 2017 11:01:56 -0700
Subject: [PATCH] Update JSBaker.cpp

---
 libraries/baking/src/JSBaker.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/libraries/baking/src/JSBaker.cpp b/libraries/baking/src/JSBaker.cpp
index 1286a5592e..630b7ae78e 100644
--- a/libraries/baking/src/JSBaker.cpp
+++ b/libraries/baking/src/JSBaker.cpp
@@ -34,7 +34,7 @@ void JSBaker::importJS() {
     // Import the file to be processed from _jsURL
     QFile jsFile(_jsURL.toLocalFile());
     if (!jsFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        handleError("Error opening " + _originalJSFilePath + " for reading");
+        handleError("Error opening " + _jsURL.fileName() + " for reading");
         return;
     }
     
@@ -85,19 +85,17 @@ void JSBaker::bakeJS(QFile* inputFile) {
                 // If '/' is not followed by '/' or '*' print '/'
                 out << currentCharacter;
             }
-        } else if (isControlCharacter(currentCharacter)) { 
+        } else if (isSpaceOrTab(currentCharacter)) { 
             // Check if white space or tab
 
             // Skip multiple spaces or tabs
-            if (isControlCharacter(nextCharacter)) {
-                while (isControlCharacter(nextCharacter)) {
-                    in >> nextCharacter;
-                    if (nextCharacter == '\n') {
-                        break;
-                    }
+            while (isSpaceOrTab(nextCharacter)) {
+                in >> nextCharacter;
+                if (nextCharacter == '\n') {
+                    break;
                 }
             }
-            
+
             // check if space can be omitted
             if (!canOmitSpace(previousCharacter, nextCharacter)) {
                 out << ' ';
@@ -107,7 +105,7 @@ void JSBaker::bakeJS(QFile* inputFile) {
             
             //Skip multiple new lines
             //Skip new line followed by space or tab
-            while (nextCharacter == '\n' || isControlCharacter(nextCharacter)) {
+            while (nextCharacter == '\n' || isSpaceOrTab(nextCharacter)) {
                 in >> nextCharacter;
             }
              
@@ -246,7 +244,7 @@ bool JSBaker::isSpecialCharacterNext(QChar c) {
 }
 
 // Check if white space or tab
-bool JSBaker::isControlCharacter(QChar c) {
+bool JSBaker::isSpaceOrTab(QChar c) {
     return (c == ' ' || c == '\t');
 }