From e624c4733e445e8bd98851c8dab2a4436fc648a3 Mon Sep 17 00:00:00 2001
From: Dianjin Wang <wangdianjin@gmail.com>
Date: Thu, 31 Aug 2023 13:51:17 +0800
Subject: [PATCH] Doc: update editor settings for CloudberryDB

Update `src/tools/editors` files and `.editorconfig` for Cloudberry
Database, including unifying the the line's max length as 78 characters.
You can copy these files to the your editors configuration files to
apply them.
---
 .editorconfig                   |  3 ++-
 src/tools/editors/clion.xml     |  2 +-
 src/tools/editors/emacs.samples | 14 +++++++++++---
 src/tools/editors/vim.samples   |  6 +++++-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index c755dda0016..2a7598025cf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,6 +4,7 @@ root = true
 indent_style = tab
 indent_size = tab
 tab_width = 4
+max_line_length = 78
 
 [*.{sgml,xml}]
 indent_style = space
@@ -16,6 +17,7 @@ indent_size = 2
 [*.cpp]
 indent_style = tab
 indent_size = 4
+max_line_length = 78
 
 [{GNUmakefile,Makefile}*]
 indent_style = tab
@@ -32,4 +34,3 @@ indent_size = 4
 [*.{dxl,mdp}]
 indent_style = space
 indent_size = 2
-
diff --git a/src/tools/editors/clion.xml b/src/tools/editors/clion.xml
index b10bcc6cda3..9f6ad59a7bb 100644
--- a/src/tools/editors/clion.xml
+++ b/src/tools/editors/clion.xml
@@ -5,7 +5,7 @@
       <option name="SMART_TABS" value="true" />
     </value>
   </option>
-  <option name="RIGHT_MARGIN" value="80" />
+  <option name="RIGHT_MARGIN" value="78" />
   <DBN-PSQL>
     <case-options enabled="false">
       <option name="KEYWORD_CASE" value="lower" />
diff --git a/src/tools/editors/emacs.samples b/src/tools/editors/emacs.samples
index 529c98a9eba..d5e7c7f05d8 100644
--- a/src/tools/editors/emacs.samples
+++ b/src/tools/editors/emacs.samples
@@ -29,7 +29,9 @@
 
 (add-hook 'c-mode-hook
           (defun postgresql-c-mode-hook ()
-            (when (string-match "/postgres\\(ql\\)?/" buffer-file-name)
+            (when (or (string-match "/postgres\\(ql\\)?/" buffer-file-name)
+	              (string-match "/cbdb/" buffer-file-name)
+	              (string-match "/cloudberrydb/" buffer-file-name))
               (c-set-style "postgresql")
               ;; Don't override the style we just set with the style in
               ;; `dir-locals-file'.  Emacs 23.4.1 needs this; it is obsolete,
@@ -59,8 +61,10 @@
 
 (add-hook 'perl-mode-hook
           (defun postgresql-perl-mode-hook ()
-             (when (string-match "/postgres\\(ql\\)?/" buffer-file-name)
-               (pgsql-perl-style))))
+            (when (or (string-match "/postgres\\(ql\\)?/" buffer-file-name)
+                      (string-match "/cbdb/" buffer-file-name)
+		      (string-match "/cloudberrydb/" buffer-file-name))
+              (pgsql-perl-style))))
 
 
 ;;; documentation files
@@ -89,3 +93,7 @@
 ;; use GNU make mode instead of plain make mode
 (add-to-list 'auto-mode-alist '("/postgres\\(ql\\)?/.*Makefile.*" . makefile-gmake-mode))
 (add-to-list 'auto-mode-alist '("/postgres\\(ql\\)?/.*\\.mk\\'" . makefile-gmake-mode))
+(add-to-list 'auto-mode-alist '("/cloudberrydb/.*Makefile.*" . makefile-gmake-mode))
+(add-to-list 'auto-mode-alist '("/cloudberrydb/.*\\.mk\\'" . makefile-gmake-mode))
+(add-to-list 'auto-mode-alist '("/cbdb/.*Makefile.*" . makefile-gmake-mode))
+(add-to-list 'auto-mode-alist '("/cbdb/.*\\.mk\\'" . makefile-gmake-mode))
diff --git a/src/tools/editors/vim.samples b/src/tools/editors/vim.samples
index ccbc93f69b6..c8577d16bd9 100644
--- a/src/tools/editors/vim.samples
+++ b/src/tools/editors/vim.samples
@@ -6,11 +6,15 @@
 "
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-:if match(getcwd(), "/pgsql") >=0 ||  match(getcwd(), "/postgresql") >= 0
+:if match(getcwd(), "/pgsql") >=0 || match(getcwd(), "/postgresql") >= 0 || match(getcwd(), "/cloudberrydb*") >= 0 || match(getcwd(), "/cbdb*") >= 0
 
 :  set cinoptions=(0
 :  set tabstop=4
 :  set shiftwidth=4
+:  set textwidth=78
+:  syntax on
+:  set colorcolumn=78
+:  highlight ColorColumn ctermbg=52
 
 :endif