From 299afb0617d5db20cf0c86360ad6c2ecdee4627d Mon Sep 17 00:00:00 2001
From: Vera Petrenkova <Vera.Petrenkova@jetbrains.com>
Date: Wed, 20 Mar 2024 09:28:36 +0100
Subject: [PATCH] IDEA-345136 Improve error handling

GitOrigin-RevId: 644d1ad6be0cc60ef87dcc3cb0f262518761c157
---
 .../src/com/intellij/ide/fileTemplates/impl/DefaultTemplate.kt | 3 ++-
 .../com/intellij/ide/fileTemplates/impl/FileTemplatesLoader.kt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/DefaultTemplate.kt b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/DefaultTemplate.kt
index ced5349ed06c..c5c5afa488b9 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/DefaultTemplate.kt
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/DefaultTemplate.kt
@@ -101,8 +101,9 @@ class DefaultTemplate(val name: String,
 
     if (text == null) {
       logger<DefaultTemplate>().error("Cannot find file by path: $fullPath")
+      return "Unexpected error occurred"
     }
-    return text ?: ""
+    return text
   }
 
   // the only external usage - https://github.com/wrdv/testme-idea/blob/8e314aea969619f43f0c6bb17f53f1d95b1072be/src/main/java/com/weirddev/testme/intellij/ui/template/FTManager.java#L200
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplatesLoader.kt b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplatesLoader.kt
index 37f589444878..f1cb78169509 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplatesLoader.kt
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplatesLoader.kt
@@ -342,8 +342,9 @@ private fun getLocalizedContent(path: String, pathResolver: Function<String, Str
   val result = pathResolver.apply(fullPath.invariantSeparatorsPathString)
   if (result == null) {
     logger<FileTemplatesLoader>().error("Cannot find file by path: $path")
+    return "Unexpected error occurred"
   }
-  return result ?: ""
+  return result
 }
 
 private fun loadFileContent(root: Path, filePath: String): String? {