From c967b6aa086b743bbc68911ed58ed5bffdebd3e5 Mon Sep 17 00:00:00 2001
From: Behrang <18451+behrangsa@users.noreply.github.com>
Date: Sat, 3 Mar 2018 16:26:28 +1100
Subject: [PATCH 1/2] Fish now will respect user's selected prompt

Fixes IDEA-173259.
---
 plugins/terminal/resources/fish/config.fish | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/terminal/resources/fish/config.fish b/plugins/terminal/resources/fish/config.fish
index d239f0eae02f..81a7b88bc89e 100644
--- a/plugins/terminal/resources/fish/config.fish
+++ b/plugins/terminal/resources/fish/config.fish
@@ -8,6 +8,12 @@ if test -f ~/.config/fish/config.fish
   . ~/.config/fish/config.fish
 end
 
+if test -d ~/.config/fish/functions
+  for f in ~/.config/fish/functions/*.fish
+    source $f
+  end
+end
+
 if test -n "$JEDITERM_USER_RCFILE"
   . "$JEDITERM_USER_RCFILE"
   set -e JEDITERM_USER_RCFILE
@@ -16,4 +22,4 @@ end
 if test -n "$JEDITERM_SOURCE"
   . "$JEDITERM_SOURCE"
   set -e JEDITERM_SOURCE
-end
\ No newline at end of file
+end

From 6b2fa485c4116b9a00774d7b0d4f1673e9606508 Mon Sep 17 00:00:00 2001
From: Behrang <18451+behrangsa@users.noreply.github.com>
Date: Mon, 12 Mar 2018 17:05:17 +1100
Subject: [PATCH 2/2] Functions should be sourced before config

Fixes an issue in which functions defined in `~/.config/fish/functions/*.fish` might get referenced in `. ~/.config/fish/config.fish`.
---
 plugins/terminal/resources/fish/config.fish | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/terminal/resources/fish/config.fish b/plugins/terminal/resources/fish/config.fish
index 81a7b88bc89e..10de5996c6b9 100644
--- a/plugins/terminal/resources/fish/config.fish
+++ b/plugins/terminal/resources/fish/config.fish
@@ -4,16 +4,16 @@ else
   set -e XDG_CONFIG_HOME
 end
 
-if test -f ~/.config/fish/config.fish
-  . ~/.config/fish/config.fish
-end
-
 if test -d ~/.config/fish/functions
   for f in ~/.config/fish/functions/*.fish
     source $f
   end
 end
 
+if test -f ~/.config/fish/config.fish
+  . ~/.config/fish/config.fish
+end
+
 if test -n "$JEDITERM_USER_RCFILE"
   . "$JEDITERM_USER_RCFILE"
   set -e JEDITERM_USER_RCFILE