Merge pull request #1451 from hvitved/csharp/element-preds

C#: Move two predicates from `csharp/Element.qll` to `dotnet/Element.qll`

Author: calumgrant

csharp/ql/src/semmle/code/csharp/Element.qll

@@ -27,10 +27,6 @@ class Element extends DotNet::Element, @element {
   /** Gets a location of this element, including sources and assemblies. */
   override Location getALocation() { none() }
 
-  override File getFile() { result = getLocation().getFile() }
-
-  override predicate fromSource() { this.getFile().fromSource() }
-
   /** Holds if this element is from an assembly. */
   predicate fromLibrary() { this.getFile().fromLibrary() }
 

csharp/ql/src/semmle/code/dotnet/Element.qll

@@ -22,10 +22,10 @@ class Element extends @dotnet_element {
   Location getALocation() { none() }
 
   /** Gets the file containing this element. */
-  File getFile() { result = getLocation().getFile() }
+  final File getFile() { result = this.getLocation().getFile() }
 
   /** Holds if this element is from source code. */
-  predicate fromSource() { none() }
+  predicate fromSource() { this.getFile().fromSource() }
 
   /**
    * Gets the "language" of this program element, as defined by the extension of the filename.