From 40b4e36c0975847748a61400d67d319769f76576 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Mar 2015 14:00:16 -0700 Subject: [PATCH 1/5] Add custom formatting for Less errors --- src/package.coffee | 8 ++++++++ src/theme-manager.coffee | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/package.coffee b/src/package.coffee index 8b63b50a8..aa6afc3ce 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -572,6 +572,14 @@ class Package SyntaxError: #{error.message} at #{location} """ + else if error.type and error.filename and error.column? and error.line? + # Less errors + location = "#{error.filename}:#{error.line}:#{error.column}" + detail = "#{error.message} in #{location}" + stack = """ + Error: #{error.message} + at #{location} + """ else detail = error.message stack = error.stack ? error diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee index 650c1d168..f6025d4d4 100644 --- a/src/theme-manager.coffee +++ b/src/theme-manager.coffee @@ -319,6 +319,9 @@ class ThemeManager @lessCache.read(lessStylesheetPath) catch error if error.line? + # Adjust line numbers for import fallbacks + error.line -= 2 if importFallbackVariables + message = "Error compiling Less stylesheet: `#{lessStylesheetPath}`" detail = """ Line number: #{error.line} From af111651f328cc48633be603d50ea968ad95ba77 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Mar 2015 16:25:56 -0700 Subject: [PATCH 2/5] :arrow_up: notifications@0.34 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 237e487cf..1d57689b7 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "link": "0.30.0", "markdown-preview": "0.144.0", "metrics": "0.45.0", - "notifications": "0.33.0", + "notifications": "0.34.0", "open-on-github": "0.34.0", "package-generator": "0.38.0", "release-notes": "0.52.0", From ddae58bd9981ce3028a90615b1df4c8dcd22bb21 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Mar 2015 16:55:47 -0700 Subject: [PATCH 3/5] :arrow_up: notifications@0.35 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d57689b7..fcd9486ee 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "link": "0.30.0", "markdown-preview": "0.144.0", "metrics": "0.45.0", - "notifications": "0.34.0", + "notifications": "0.35.0", "open-on-github": "0.34.0", "package-generator": "0.38.0", "release-notes": "0.52.0", From 27ffac5f1a73dff7914080d5cab7a1179592504e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 24 Mar 2015 08:42:41 -0700 Subject: [PATCH 4/5] Set less property on caught error --- src/package.coffee | 4 ++-- src/theme-manager.coffee | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/package.coffee b/src/package.coffee index aa6afc3ce..ebc771123 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -572,12 +572,12 @@ class Package SyntaxError: #{error.message} at #{location} """ - else if error.type and error.filename and error.column? and error.line? + else if error.less and error.filename and error.column? and error.line? # Less errors location = "#{error.filename}:#{error.line}:#{error.column}" detail = "#{error.message} in #{location}" stack = """ - Error: #{error.message} + LessError: #{error.message} at #{location} """ else diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee index f6025d4d4..0ff42c4d2 100644 --- a/src/theme-manager.coffee +++ b/src/theme-manager.coffee @@ -318,6 +318,7 @@ class ThemeManager else @lessCache.read(lessStylesheetPath) catch error + error.less = true if error.line? # Adjust line numbers for import fallbacks error.line -= 2 if importFallbackVariables From 856a6f91f66ecd51a4ba77f41e1bfa9b348f61ae Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 24 Mar 2015 11:06:01 -0700 Subject: [PATCH 5/5] :arrow_up: apm@0.149 --- apm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm/package.json b/apm/package.json index 374a7d98a..544292634 100644 --- a/apm/package.json +++ b/apm/package.json @@ -6,6 +6,6 @@ "url": "https://github.com/atom/atom.git" }, "dependencies": { - "atom-package-manager": "0.147.0" + "atom-package-manager": "0.149.0" } }