Revert "Revert "Add readable message for exception""

This reverts commit da3f560.

Author: SBeator

lib/sort-json-core.js

@@ -180,13 +180,27 @@ function checkIfNeedTailingComma(objectString) {
   return objectString.match(/,[\s\t\n]*\}/);
 }
 
+function checkIsObjectText(selectedText) {
+  return (
+    selectedText.length > 2 &&
+    selectedText[0] === '{' &&
+    selectedText[selectedText.length - 1] === '}'
+  );
+}
+
 function selectedTextToSortedText(
   selectedText,
   indent,
   jsonParser,
   sortOrder,
   sortOptions
 ) {
+  var isObejct = checkIsObjectText(selectedText);
+
+  if (!isObejct) {
+    throw 'Please make sure your selected text is a JS obejct!';
+  }
+
   var autoIndent = getAutoIndent(selectedText, indent);
 
   var marks = [];
@@ -201,7 +215,15 @@ function selectedTextToSortedText(
   console.log('marks');
   console.log(marks);
 
-  var initialJSON = sorter.textToJSON(jsonParser, json);
+  try {
+    var initialJSON = sorter.textToJSON(jsonParser, json);
+  } catch (e) {
+    if (e.name == 'SyntaxError') {
+      throw 'Please make sure your selected text is a JS obejct!';
+    } else {
+      throw e;
+    }
+  }
   var sortedJSON = sorter.sortJSON(initialJSON, sortOrder, sortOptions);
 
   var sortedJsonText = sorter.jsonToText(jsonParser, sortedJSON, indent);

test/extension.test.js

@@ -13,8 +13,8 @@ var assert = require('assert');
 var sorter = require('../lib/sort-json-core');
 var JSON5 = require('json5');
 
-suite('Extension Tests', function () {
-  test('normal js object asc', function () {
+suite('Extension Tests', function() {
+  test('normal js object asc', function() {
     var jsObject = `{
         user: 'user',
         aaa: 'aaa',
@@ -35,7 +35,35 @@ suite('Extension Tests', function () {
     );
   });
 
-  test('normal js object desc', function () {
+  test('Not js object', function() {
+    var jsObject = `aaa: 1`;
+
+    var result;
+    try {
+      result = sorter.sort(jsObject, 4, JSON5, ['asc'], {});
+    } catch (e) {
+      result = e;
+    }
+
+    assert.equal(result, 'Please make sure your selected text is a JS obejct!');
+  });
+
+  test('Not js object 2', function() {
+    var jsObject = `{test('normal js object desc', function() {
+      var jsObject = '';
+    }`;
+
+    var result;
+    try {
+      result = sorter.sort(jsObject, 4, JSON5, ['asc'], {});
+    } catch (e) {
+      result = e;
+    }
+
+    assert.equal(result, 'Please make sure your selected text is a JS obejct!');
+  });
+
+  test('normal js object desc', function() {
     var jsObject = `{
         user: 'user',
         aaa: 'aaa',
@@ -56,7 +84,7 @@ suite('Extension Tests', function () {
     );
   });
 
-  test('normal js object indent 2', function () {
+  test('normal js object indent 2', function() {
     var jsObject = `{
       user: 'user',
       aaa: 'aaa',
@@ -77,7 +105,7 @@ suite('Extension Tests', function () {
     );
   });
 
-  test('format js object', function () {
+  test('format js object', function() {
     var jsObject = `{
         user : 'user',
 
@@ -99,7 +127,7 @@ suite('Extension Tests', function () {
     );
   });
 
-  test('ES6 feature test', function () {
+  test('ES6 feature test', function() {
     var jsObject = `{
         user: 'user',
         aaa,
@@ -120,7 +148,7 @@ suite('Extension Tests', function () {
     );
   });
 
-  test('Multi lines value test', function () {
+  test('Multi lines value test', function() {
     var jsObject = `{
         b: new String('b')
             .length,
@@ -138,7 +166,7 @@ suite('Extension Tests', function () {
     );
   });
 
-  test('Auto add comma', function () {
+  test('Auto add comma', function() {
     var jsObject = `{
         b: 'b',
         a: 'a',
@@ -155,7 +183,7 @@ suite('Extension Tests', function () {
     );
   });
 
-  test('Support line comments', function () {
+  test('Support line comments', function() {
     var jsObject = `{
         b: 2,
         // some comment
@@ -180,7 +208,7 @@ suite('Extension Tests', function () {
     );
   });
 
-  test('Support line comments for indent 2', function () {
+  test('Support line comments for indent 2', function() {
     var jsObject = `{
         b: 2,
         // some comment
@@ -205,7 +233,7 @@ suite('Extension Tests', function () {
     );
   });
 
-  test('Support line comments at the end of the object', function () {
+  test('Support line comments at the end of the object', function() {
     var jsObject = `{
         b: 2,
         // some comment
@@ -232,7 +260,7 @@ suite('Extension Tests', function () {
     );
   });
 
-  test("Support ' in string", function () {
+  test("Support ' in string", function() {
     var jsObject = `{
         b: 'test \\'',
         c: 'test \\' test',
@@ -251,7 +279,7 @@ suite('Extension Tests', function () {
     );
   });
 
-  test('Not change " in string ', function () {
+  test('Not change " in string ', function() {
     var jsObject = `{
         d: "\\" test",
         b: 'test " test',
@@ -274,7 +302,7 @@ suite('Extension Tests', function () {
     );
   });
 
-  test('Support ES6 string key', function () {
+  test('Support ES6 string key', function() {
     var jsObject = `{
         'b': 'test',
         a: 1,
@@ -294,4 +322,4 @@ suite('Extension Tests', function () {
     }`
     );
   });
-});
+});