Extract field declarations

tamasvajk · igfoo · commit 67d2c52e860b · 2022-05-10T19:51:11.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -496,6 +496,16 @@ open class KotlinFileExtractor(
 
         extractVisibility(f, id, f.visibility)
 
+        if (!isExternalDeclaration(f)) {
+            val fieldDeclarationId = tw.getFreshIdLabel<DbFielddecl>()
+            tw.writeFielddecls(fieldDeclarationId, parentId)
+            tw.writeFieldDeclaredIn(id, fieldDeclarationId, 0)
+            tw.writeHasLocation(fieldDeclarationId, locId)
+
+            val typeAccessId = tw.getFreshIdLabel<DbUnannotatedtypeaccess>()
+            tw.writeExprs_unannotatedtypeaccess(typeAccessId, type.javaResult.id, type.kotlinResult.id, fieldDeclarationId, 0)
+        }
+
         return id
     }
 
diff --git a/java/ql/test/kotlin/library-tests/exprs/exprs.expected b/java/ql/test/kotlin/library-tests/exprs/exprs.expected
@@ -626,9 +626,13 @@
 | file://:0:0:0:0 | MyLambda | funcExprs.kt:13:1:29:1 | call | TypeAccess |
 | file://:0:0:0:0 | Object | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
 | file://:0:0:0:0 | Object | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
+| file://:0:0:0:0 | String | file://:0:0:0:0 | <none> | TypeAccess |
 | file://:0:0:0:0 | String | localFunctionCalls.kt:3:1:11:1 | x | TypeAccess |
 | file://:0:0:0:0 | Unit | exprs.kt:168:6:170:1 | Direction | TypeAccess |
 | file://:0:0:0:0 | Unit | exprs.kt:172:6:176:1 | Color | TypeAccess |
+| file://:0:0:0:0 | int | file://:0:0:0:0 | <none> | TypeAccess |
+| file://:0:0:0:0 | int | file://:0:0:0:0 | <none> | TypeAccess |
+| file://:0:0:0:0 | int | file://:0:0:0:0 | <none> | TypeAccess |
 | file://:0:0:0:0 | tmp0 | exprs.kt:4:1:136:1 | topLevelMethod | LocalVariableDeclExpr |
 | funcExprs.kt:14:5:14:33 | functionExpression0a(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
 | funcExprs.kt:14:26:14:33 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
diff --git a/java/ql/test/kotlin/library-tests/properties/properties.expected b/java/ql/test/kotlin/library-tests/properties/properties.expected
@@ -1,3 +1,25 @@
+fieldDeclarations
+| properties.kt:2:27:2:50 | int constructorProp; | properties.kt:2:27:2:50 | constructorProp | 0 |
+| properties.kt:2:53:2:83 | int mutableConstructorProp; | properties.kt:2:53:2:83 | mutableConstructorProp | 0 |
+| properties.kt:3:5:3:25 | int modifiableInt; | properties.kt:3:5:3:25 | modifiableInt | 0 |
+| properties.kt:4:5:4:24 | int immutableInt; | properties.kt:4:5:4:24 | immutableInt | 0 |
+| properties.kt:5:5:5:26 | int typedProp; | properties.kt:5:5:5:26 | typedProp | 0 |
+| properties.kt:7:5:7:30 | int initialisedInInit; | properties.kt:7:5:7:30 | initialisedInInit | 0 |
+| properties.kt:11:5:11:40 | int useConstructorArg; | properties.kt:11:5:11:40 | useConstructorArg | 0 |
+| properties.kt:19:5:20:15 | int defaultGetter; | properties.kt:19:5:20:15 | defaultGetter | 0 |
+| properties.kt:21:5:22:15 | int varDefaultGetter; | properties.kt:21:5:22:15 | varDefaultGetter | 0 |
+| properties.kt:23:5:24:15 | int varDefaultSetter; | properties.kt:23:5:24:15 | varDefaultSetter | 0 |
+| properties.kt:25:5:27:15 | int varDefaultGetterSetter; | properties.kt:25:5:27:15 | varDefaultGetterSetter | 0 |
+| properties.kt:28:5:29:22 | int overrideGetter; | properties.kt:28:5:29:22 | overrideGetter | 0 |
+| properties.kt:30:5:31:29 | int overrideGetterUseField; | properties.kt:30:5:31:29 | overrideGetterUseField | 0 |
+| properties.kt:32:5:33:29 | int useField; | properties.kt:32:5:33:29 | useField | 0 |
+| properties.kt:34:5:34:36 | String lateInitVar; | properties.kt:34:5:34:36 | lateInitVar | 0 |
+| properties.kt:35:5:35:32 | int privateProp; | properties.kt:35:5:35:32 | privateProp | 0 |
+| properties.kt:36:5:36:36 | int protectedProp; | properties.kt:36:5:36:36 | protectedProp | 0 |
+| properties.kt:37:5:37:30 | int publicProp; | properties.kt:37:5:37:30 | publicProp | 0 |
+| properties.kt:38:5:38:34 | int internalProp; | properties.kt:38:5:38:34 | internalProp | 0 |
+| properties.kt:67:1:67:23 | int constVal; | properties.kt:67:1:67:23 | constVal | 0 |
+#select
 | properties.kt:2:27:2:50 | constructorProp | properties.kt:2:27:2:50 | getConstructorProp | file://:0:0:0:0 | <none> | properties.kt:2:27:2:50 | constructorProp | public |
 | properties.kt:2:53:2:83 | mutableConstructorProp | properties.kt:2:53:2:83 | getMutableConstructorProp | properties.kt:2:53:2:83 | setMutableConstructorProp | properties.kt:2:53:2:83 | mutableConstructorProp | public |
 | properties.kt:3:5:3:25 | modifiableInt | properties.kt:3:5:3:25 | getModifiableInt | properties.kt:3:5:3:25 | setModifiableInt | properties.kt:3:5:3:25 | modifiableInt | public |
diff --git a/java/ql/test/kotlin/library-tests/properties/properties.ql b/java/ql/test/kotlin/library-tests/properties/properties.ql
@@ -6,34 +6,34 @@ newtype TMaybeElement =
 
 class MaybeElement extends TMaybeElement {
   abstract string toString();
+
   abstract Location getLocation();
 }
 
 class YesMaybeElement extends MaybeElement {
   Element e;
 
   YesMaybeElement() { this = TElement(e) }
+
   override string toString() { result = e.toString() }
+
   override Location getLocation() { result = e.getLocation() }
 }
 
 class NoMaybeElement extends MaybeElement {
   NoMaybeElement() { this = TNoElement() }
 
   override string toString() { result = "<none>" }
+
   override Location getLocation() { none() }
 }
 
 MaybeElement getter(Property p) {
-  if exists(p.getGetter())
-  then result = TElement(p.getGetter())
-  else result = TNoElement()
+  if exists(p.getGetter()) then result = TElement(p.getGetter()) else result = TNoElement()
 }
 
 MaybeElement setter(Property p) {
-  if exists(p.getSetter())
-  then result = TElement(p.getSetter())
-  else result = TNoElement()
+  if exists(p.getSetter()) then result = TElement(p.getSetter()) else result = TNoElement()
 }
 
 MaybeElement backingField(Property p) {
@@ -46,3 +46,4 @@ from Property p
 where p.fromSource()
 select p, getter(p), setter(p), backingField(p), concat(string s | p.hasModifier(s) | s, ", ")
 
+query predicate fieldDeclarations(FieldDeclaration fd, Field f, int i) { fd.getField(i) = f }
