diff --git a/idea/idea-frontend-fir/testData/components/expressionType/binaryExpression.kt b/idea/idea-frontend-fir/testData/components/expressionType/binaryExpression.kt
new file mode 100644
index 00000000000..fa89fbff8f9
--- /dev/null
+++ b/idea/idea-frontend-fir/testData/components/expressionType/binaryExpression.kt
@@ -0,0 +1,6 @@
+val x = <expr>1 + 2</expr>
+// RESULT
+
+// expression: 1 + 2
+// type: kotlin.Int
+
diff --git a/idea/idea-frontend-fir/testData/components/expressionType/breakExpression.kt b/idea/idea-frontend-fir/testData/components/expressionType/breakExpression.kt
new file mode 100644
index 00000000000..bb19092e2bb
--- /dev/null
+++ b/idea/idea-frontend-fir/testData/components/expressionType/breakExpression.kt
@@ -0,0 +1,10 @@
+fun x(): Int {
+    for(i in 1..2) {
+       <expr>break</expr>
+    }
+}
+// RESULT
+
+// expression: break
+// type: kotlin.Nothing
+
diff --git a/idea/idea-frontend-fir/testData/components/expressionType/functionCall.kt b/idea/idea-frontend-fir/testData/components/expressionType/functionCall.kt
new file mode 100644
index 00000000000..04c50d16756
--- /dev/null
+++ b/idea/idea-frontend-fir/testData/components/expressionType/functionCall.kt
@@ -0,0 +1,7 @@
+val a = 12
+val x = <expr>12.toByte()</expr>
+// RESULT
+
+// expression: 12.toByte()
+// type: kotlin.Byte
+
diff --git a/idea/idea-frontend-fir/testData/components/expressionType/inParens.kt b/idea/idea-frontend-fir/testData/components/expressionType/inParens.kt
new file mode 100644
index 00000000000..4ac23c00ca2
--- /dev/null
+++ b/idea/idea-frontend-fir/testData/components/expressionType/inParens.kt
@@ -0,0 +1,6 @@
+val x = <expr>(1 + 2)</expr> + 3
+// RESULT
+
+// expression: (1 + 2)
+// type: kotlin.Int
+
diff --git a/idea/idea-frontend-fir/testData/components/expressionType/insideStringTemplate.kt b/idea/idea-frontend-fir/testData/components/expressionType/insideStringTemplate.kt
new file mode 100644
index 00000000000..004ce964ce5
--- /dev/null
+++ b/idea/idea-frontend-fir/testData/components/expressionType/insideStringTemplate.kt
@@ -0,0 +1,7 @@
+val a = 10
+val x = "abc${<expr>a</expr>}defg"
+// RESULT
+
+// expression: a
+// type: kotlin.Int
+
diff --git a/idea/idea-frontend-fir/testData/components/expressionType/insideStringTemplateWithBinrary.kt b/idea/idea-frontend-fir/testData/components/expressionType/insideStringTemplateWithBinrary.kt
new file mode 100644
index 00000000000..5be24f40895
--- /dev/null
+++ b/idea/idea-frontend-fir/testData/components/expressionType/insideStringTemplateWithBinrary.kt
@@ -0,0 +1,7 @@
+val a = 10
+val x = "abc${<expr>a</expr> + 20}defg"
+// RESULT
+
+// expression: a
+// type: kotlin.Int
+
diff --git a/idea/idea-frontend-fir/testData/components/expressionType/intLiteral.kt b/idea/idea-frontend-fir/testData/components/expressionType/intLiteral.kt
new file mode 100644
index 00000000000..cc9cdd9cccf
--- /dev/null
+++ b/idea/idea-frontend-fir/testData/components/expressionType/intLiteral.kt
@@ -0,0 +1,6 @@
+val x = <expr>1</expr>
+// RESULT
+
+// expression: 1
+// type: kotlin.Int
+
diff --git a/idea/idea-frontend-fir/testData/components/expressionType/returnExpression.kt b/idea/idea-frontend-fir/testData/components/expressionType/returnExpression.kt
new file mode 100644
index 00000000000..158272facd3
--- /dev/null
+++ b/idea/idea-frontend-fir/testData/components/expressionType/returnExpression.kt
@@ -0,0 +1,8 @@
+fun x(): Int {
+    <expr>return 1</expr>
+}
+// RESULT
+
+// expression: return 1
+// type: kotlin.Nothing
+
diff --git a/idea/idea-frontend-fir/testData/components/expressionType/stringLiteral.kt b/idea/idea-frontend-fir/testData/components/expressionType/stringLiteral.kt
new file mode 100644
index 00000000000..a8239a8098c
--- /dev/null
+++ b/idea/idea-frontend-fir/testData/components/expressionType/stringLiteral.kt
@@ -0,0 +1,6 @@
+val x = <expr>"abc"</expr>
+// RESULT
+
+// expression: "abc"
+// type: kotlin.String
+
diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/HLExpressionTypeTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/HLExpressionTypeTestGenerated.java
index f4a24990067..23d9c2e0621 100644
--- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/HLExpressionTypeTestGenerated.java
+++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/HLExpressionTypeTestGenerated.java
@@ -34,11 +34,55 @@ public class HLExpressionTypeTestGenerated extends AbstractHLExpressionTypeTest
         runTest("idea/idea-frontend-fir/testData/components/expressionType/assignmentExpressionTarget.kt");
     }
 
+    @TestMetadata("binaryExpression.kt")
+    public void testBinaryExpression() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/components/expressionType/binaryExpression.kt");
+    }
+
+    @TestMetadata("breakExpression.kt")
+    public void testBreakExpression() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/components/expressionType/breakExpression.kt");
+    }
+
     @TestMetadata("forExpression.kt")
     public void testForExpression() throws Exception {
         runTest("idea/idea-frontend-fir/testData/components/expressionType/forExpression.kt");
     }
 
+    @TestMetadata("functionCall.kt")
+    public void testFunctionCall() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/components/expressionType/functionCall.kt");
+    }
+
+    @TestMetadata("inParens.kt")
+    public void testInParens() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/components/expressionType/inParens.kt");
+    }
+
+    @TestMetadata("insideStringTemplate.kt")
+    public void testInsideStringTemplate() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/components/expressionType/insideStringTemplate.kt");
+    }
+
+    @TestMetadata("insideStringTemplateWithBinrary.kt")
+    public void testInsideStringTemplateWithBinrary() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/components/expressionType/insideStringTemplateWithBinrary.kt");
+    }
+
+    @TestMetadata("intLiteral.kt")
+    public void testIntLiteral() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/components/expressionType/intLiteral.kt");
+    }
+
+    @TestMetadata("returnExpression.kt")
+    public void testReturnExpression() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/components/expressionType/returnExpression.kt");
+    }
+
+    @TestMetadata("stringLiteral.kt")
+    public void testStringLiteral() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/components/expressionType/stringLiteral.kt");
+    }
 
     @TestMetadata("whileExpression.kt")
     public void testWhileExpression() throws Exception {