Merge pull request #80 from kapilratnani/bug-56-line-break

use line ending setting from editor

Author: kapilratnani

NppJSONViewer/PluginDefinition.cpp

@@ -245,7 +245,22 @@ void formatSelectedJSON()
 	bool useTabs = ::SendMessage(curScintilla, SCI_GETUSETABS, 0, 0);
 	unsigned indentLen = useTabs ? 1 : static_cast<unsigned>(::SendMessage(curScintilla, SCI_GETTABWIDTH, 0, 0));
 	char indentChar = useTabs ? '\t' : ' ';
+
+  LRESULT eolMode = ::SendMessage(curScintilla, SCI_GETEOLMODE, 0, 0);
+  switch (eolMode) {
+    case 0:
+      pw.SetLineEnding(rapidjson::LineEndingOption::kCrLf);
+      break;
+    case 1:
+      pw.SetLineEnding(rapidjson::LineEndingOption::kCr);
+      break;
+    default:
+      pw.SetLineEnding(rapidjson::LineEndingOption::kLf);
+      break;
+  }
+
 	pw.SetIndent(indentChar, indentLen);
+  
 	rapidjson::StringStream ss(curJSON);
 	rapidjson::Reader reader;
 

NppJSONViewer/rapidjson/prettywriter.h

@@ -37,6 +37,12 @@ enum PrettyFormatOptions {
     kFormatSingleLineArray = 1  //!< Format arrays on a single line.
 };
 
+enum LineEndingOption {
+  kLf = 0, // default line ending \n
+  kCrLf = 1, // \r\n for windows
+  kCr = 2 // \r for Mac
+};
+
 //! Writer with indentation and spacing.
 /*!
     \tparam OutputStream Type of ouptut os.
@@ -56,7 +62,7 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
         \param levelDepth Initial capacity of stack.
     */
     explicit PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
-        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4), formatOptions_(kFormatDefault) {}
+        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4), formatOptions_(kFormatDefault),  lineEndingOption_(kLf) {}
 
 
     explicit PrettyWriter(StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
@@ -79,6 +85,11 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
         return *this;
     }
 
+    PrettyWriter& SetLineEnding(LineEndingOption lineEndingOption) {
+      lineEndingOption_ = lineEndingOption;
+      return *this;
+    }
+
     //! Set pretty writer formatting options.
     /*! \param options Formatting options.
     */
@@ -143,7 +154,7 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
         bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
 
         if (!empty) {
-            Base::os_->Put('\n');
+            WriteLineEnding();
             WriteIndent();
         }
         bool ret = Base::WriteEndObject();
@@ -167,7 +178,7 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
         bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
 
         if (!empty && !(formatOptions_ & kFormatSingleLineArray)) {
-            Base::os_->Put('\n');
+            WriteLineEnding();
             WriteIndent();
         }
         bool ret = Base::WriteEndArray();
@@ -218,23 +229,23 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
                 }
 
                 if (!(formatOptions_ & kFormatSingleLineArray)) {
-                    Base::os_->Put('\n');
+                    WriteLineEnding();
                     WriteIndent();
                 }
             }
             else {  // in object
                 if (level->valueCount > 0) {
                     if (level->valueCount % 2 == 0) {
                         Base::os_->Put(',');
-                        Base::os_->Put('\n');
+                        WriteLineEnding();
                     }
                     else {
                         Base::os_->Put(':');
                         Base::os_->Put(' ');
                     }
                 }
                 else
-                    Base::os_->Put('\n');
+                    WriteLineEnding();
 
                 if (level->valueCount % 2 == 0)
                     WriteIndent();
@@ -254,10 +265,25 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
         PutN(*Base::os_, static_cast<typename OutputStream::Ch>(indentChar_), count);
     }
 
+    void WriteLineEnding() {
+      switch (lineEndingOption_) {
+        case kCrLf: 
+          Base::os_->Put('\r');
+          Base::os_->Put('\n');
+          break;
+        case kCr:
+          Base::os_->Put('\r');
+          break;
+        default:
+          Base::os_->Put('\n');
+          break;
+      }
+    }
+
     Ch indentChar_;
     unsigned indentCharCount_;
     PrettyFormatOptions formatOptions_;
-
+    LineEndingOption lineEndingOption_;
 private:
     // Prohibit copy constructor & assignment operator.
     PrettyWriter(const PrettyWriter&);