Fix broken NavBar for 201

^KT-38466 Fixed
^KT-38260 Fixed

idea/testData/navigationToolbar/ClassProperty.kt

@@ -0,0 +1,8 @@
+// NAV_BAR_ITEMS: src, ClassProperty
+
+class ClassProperty  {
+    val foo: Int
+        get() {
+            return 42<caret>
+        }
+}

idea/testData/navigationToolbar/ClassProperty.kt.201

@@ -0,0 +1,8 @@
+// NAV_BAR_ITEMS: src, ClassProperty, foo: Int
+
+class ClassProperty  {
+    val foo: Int
+        get() {
+            return 42<caret>
+        }
+}

idea/testData/navigationToolbar/MethodInClass.kt

@@ -0,0 +1,5 @@
+// NAV_BAR_ITEMS: src, MethodInClass
+
+class MethodInClass {
+    fun foo() { <caret> }
+}

idea/testData/navigationToolbar/MethodInClass.kt.201

@@ -0,0 +1,5 @@
+// NAV_BAR_ITEMS: src, MethodInClass, foo()
+
+class MethodInClass {
+    fun foo() { <caret> }
+}

idea/testData/navigationToolbar/SeveralClassesInFile.kt

@@ -0,0 +1,13 @@
+// NAV_BAR_ITEMS: src, SeveralClassesInFile.kt
+
+class Foo {
+
+}
+
+class SeveralClassesInFile {
+    <caret>
+}
+
+fun method() {
+
+}

idea/testData/navigationToolbar/SeveralClassesInFile.kt.201

@@ -0,0 +1,13 @@
+// NAV_BAR_ITEMS: src, SeveralClassesInFile.kt, SeveralClassesInFile
+
+class Foo {
+
+}
+
+class SeveralClassesInFile {
+    <caret>
+}
+
+fun method() {
+
+}

idea/testData/navigationToolbar/fileNameDoesntMatchClassName.kt

@@ -0,0 +1,5 @@
+// NAV_BAR_ITEMS: src, fileNameDoesntMatchClassName.kt
+
+class Foo {
+    fun bar() { <caret> }
+}

idea/testData/navigationToolbar/fileNameDoesntMatchClassName.kt.201

@@ -0,0 +1,5 @@
+// NAV_BAR_ITEMS: src, fileNameDoesntMatchClassName.kt, Foo, bar()
+
+class Foo {
+    fun bar() { <caret> }
+}

idea/testData/navigationToolbar/topLevelFunction.kt

@@ -0,0 +1,9 @@
+// NAV_BAR_ITEMS: src, topLevelFunction.kt
+
+fun foo() {
+    val bar = <caret>"string"
+}
+
+class SomeClass {
+
+}

idea/testData/navigationToolbar/topLevelFunction.kt.201

@@ -0,0 +1,9 @@
+// NAV_BAR_ITEMS: src, topLevelFunction.kt, foo()
+
+fun foo() {
+    val bar = <caret>"string"
+}
+
+class SomeClass {
+
+}

idea/testData/navigationToolbar/topLevelProperty.kt

@@ -0,0 +1,6 @@
+// NAV_BAR_ITEMS: src, topLevelProperty.kt
+
+val foo: Int
+    get() {
+        return 1<caret>
+    }

idea/testData/navigationToolbar/topLevelProperty.kt.201

@@ -0,0 +1,6 @@
+// NAV_BAR_ITEMS: src, topLevelProperty.kt, foo: Int
+
+val foo: Int
+    get() {
+        return 1<caret>
+    }