From 9d117d10b82c086d74b5f154334a598bce7f105f Mon Sep 17 00:00:00 2001
From: Alex Ford <alexrford@github.com>
Date: Wed, 21 Apr 2021 10:45:42 +0100
Subject: [PATCH] drop MetricFile class

---
 ql/src/codeql/files/FileSystem.qll         | 6 ------
 ql/src/queries/metrics/FLines.ql           | 2 +-
 ql/src/queries/metrics/FLinesOfCode.ql     | 2 +-
 ql/src/queries/metrics/FLinesOfComments.ql | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/ql/src/codeql/files/FileSystem.qll b/ql/src/codeql/files/FileSystem.qll
index 6bc8b1b5c3b..ae8571ecc05 100644
--- a/ql/src/codeql/files/FileSystem.qll
+++ b/ql/src/codeql/files/FileSystem.qll
@@ -169,12 +169,6 @@ class File extends Container, @file {
   /** Gets the URL of this file. */
   override string getURL() { result = "file://" + this.getAbsolutePath() + ":0:0:0:0" }
 
-  /** Gets the metric file. */
-  MetricFile getMetrics() { result = this }
-}
-
-/** A wrapper providing metrics for a file */
-class MetricFile extends File {
   /** Gets the number of lines in this file. */
   int getNumberOfLines() { result = max(getAToken().getLocation().getEndLine()) }
 
diff --git a/ql/src/queries/metrics/FLines.ql b/ql/src/queries/metrics/FLines.ql
index 5b784345fb2..d14cb6a33fd 100644
--- a/ql/src/queries/metrics/FLines.ql
+++ b/ql/src/queries/metrics/FLines.ql
@@ -10,5 +10,5 @@
 import ruby
 
 from File f, int n
-where n = f.getMetrics().getNumberOfLines()
+where n = f.getNumberOfLines()
 select f, n order by n desc
diff --git a/ql/src/queries/metrics/FLinesOfCode.ql b/ql/src/queries/metrics/FLinesOfCode.ql
index 6a887999fdc..1381e0bfaa5 100644
--- a/ql/src/queries/metrics/FLinesOfCode.ql
+++ b/ql/src/queries/metrics/FLinesOfCode.ql
@@ -11,5 +11,5 @@
 import ruby
 
 from File f, int n
-where n = f.getMetrics().getNumberOfLinesOfCode()
+where n = f.getNumberOfLinesOfCode()
 select f, n order by n desc
diff --git a/ql/src/queries/metrics/FLinesOfComments.ql b/ql/src/queries/metrics/FLinesOfComments.ql
index 55d4e171820..0d252ebe140 100644
--- a/ql/src/queries/metrics/FLinesOfComments.ql
+++ b/ql/src/queries/metrics/FLinesOfComments.ql
@@ -10,5 +10,5 @@
 import ruby
 
 from File f, int n
-where n = f.getMetrics().getNumberOfLinesOfComments()
+where n = f.getNumberOfLinesOfComments()
 select f, n order by n desc