Raise an AppMap exception instead of MethodSource::SourceNotFoundError

Author: symwell

lib/appmap/trace.rb

@@ -46,6 +46,9 @@ def source_location
       # CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
       # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
       # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+      class SourceNotFoundError < StandardError; end
+
       def appmap_extract_last_comment(lines)
         buffer = []
 
@@ -72,11 +75,11 @@ def appmap_lines_for(file_name, name=nil)
         @lines_for_file ||= {}
         @lines_for_file[file_name] ||= File.readlines(file_name)
       rescue Errno::ENOENT => e
-        raise MethodSource::SourceNotFoundError, "Could not load source for #{name}: #{e.message}"
+        raise AppMap::Trace::RubyMethod::SourceNotFoundError, "Could not load source for #{name}: #{e.message}"
       end
 
       def appmap_comment_helper(source_location, name=nil)
-        raise MethodSource::SourceNotFoundError, "Could not locate source for #{name}!" unless source_location
+        raise AppMap::Trace::RubyMethod::SourceNotFoundError, "Could not locate source for #{name}!" unless source_location
         file, line = *source_location
 
         appmap_comment_describing(appmap_lines_for(file), line)
@@ -86,18 +89,21 @@ def comment
         # use AppMap's optimization in appmap_extract_last_comment to
         # extract comments...
         appmap_comment_helper(source_location, defined?(name) ? name : inspect)
-
         # ... instead of use MethodSource which hasn't merged
         # https://github.com/banister/method_source/pull/78.  When/if
         # this pr gets merged, AppMap's optimization can be removed
-        # and the following code can be uncommented:
-
-        # @method.comment
-      rescue MethodSource::SourceNotFoundError, Errno::EINVAL
+        # and the previous implementation of "def comment" can be uncommented:
+      rescue AppMap::Trace::RubyMethod::SourceNotFoundError, Errno::EINVAL
         nil
       end
       # =======================================================================
 
+      # def comment
+      #   @method.comment
+      # rescue MethodSource::SourceNotFoundError, Errno::EINVAL
+      #   nil
+      # end
+
       def package
         @package.name
       end