From 377d1f0a063695ae1fdc230b4b0ae4797546c648 Mon Sep 17 00:00:00 2001
From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Tue, 17 Dec 2019 21:42:05 +0300
Subject: [PATCH] terminal: source fish/functions/* after fish/conf.d/*
 (IDEA-227054)

GitOrigin-RevId: 921682862060439f60f7dca6847b4fbc74543668
---
 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 204372985e26..34997ea9b96c 100644
--- a/plugins/terminal/resources/fish/config.fish
+++ b/plugins/terminal/resources/fish/config.fish
@@ -4,14 +4,14 @@ else
   set -e XDG_CONFIG_HOME
 end
 
-if test -d ~/.config/fish/conf.d
-  for f in ~/.config/fish/conf.d/*.fish
+if test -d ~/.config/fish/functions
+  for f in ~/.config/fish/functions/*.fish
     source $f
   end
 end
 
-if test -d ~/.config/fish/functions
-  for f in ~/.config/fish/functions/*.fish
+if test -d ~/.config/fish/conf.d
+  for f in ~/.config/fish/conf.d/*.fish
     source $f
   end
 end