support enhanced gf in html (not just js) for ng-include

Author: burnettk

plugin/angular.vim

@@ -199,11 +199,11 @@ nnoremap <silent> <Plug>AngularGfTabjump :<C-U>exe <SID>FindFileBasedOnAngularSe
 
 augroup angular_gf
   autocmd!
-  autocmd FileType javascript command! -buffer AngularGoToFile :call s:FindFileBasedOnAngularServiceUnderCursor('open')
-  autocmd FileType javascript nmap <buffer> gf          <Plug>AngularGfJump
-  autocmd FileType javascript nmap <buffer> <C-W>f      <Plug>AngularGfSplit
-  autocmd FileType javascript nmap <buffer> <C-W><C-F>  <Plug>AngularGfSplit
-  autocmd FileType javascript nmap <buffer> <C-W>gf     <Plug>AngularGfTabjump
+  autocmd FileType javascript,html command! -buffer AngularGoToFile :call s:FindFileBasedOnAngularServiceUnderCursor('open')
+  autocmd FileType javascript,html nmap <buffer> gf          <Plug>AngularGfJump
+  autocmd FileType javascript,html nmap <buffer> <C-W>f      <Plug>AngularGfSplit
+  autocmd FileType javascript,html nmap <buffer> <C-W><C-F>  <Plug>AngularGfSplit
+  autocmd FileType javascript,html nmap <buffer> <C-W>gf     <Plug>AngularGfTabjump
 augroup END
 
 augroup angular_alternate

spec/alternate_spec.rb

@@ -2,23 +2,6 @@
 
 describe "alternate" do
 
-  def should_alternate_from_a_to_b(file_a, file_b)
-    vim.edit file_a
-    current_file_name.should eq file_a
-    vim.command 'A'
-    current_file_name.should eq file_b
-  end
-
-  def should_alternate_between(file_a, file_b)
-    code_path = file_a
-    test_path = file_b
-    setup_filesystem(code_path, test_path)
-    should_alternate_from_a_to_b(code_path, test_path)
-    should_alternate_from_a_to_b(test_path, code_path)
-    FileUtils.rm(file_a)
-    FileUtils.rm(file_b)
-  end
-
   specify "pairs that should work" do
     should_alternate_between('app/src/poo.js', 'test/unit/poo.js')
     should_alternate_between('app/src/poo.js', 'test/unit/pooSpec.js')
@@ -36,5 +19,24 @@ def should_alternate_between(file_a, file_b)
     vim.command 'A'
     current_file_name.should eq file_a
   end
-end
 
+private
+
+  def should_alternate_from_a_to_b(file_a, file_b)
+    vim.edit file_a
+    current_file_name.should eq file_a
+    vim.command 'A'
+    current_file_name.should eq file_b
+  end
+
+  def should_alternate_between(file_a, file_b)
+    code_path = file_a
+    test_path = file_b
+    setup_filesystem(code_path, test_path)
+    should_alternate_from_a_to_b(code_path, test_path)
+    should_alternate_from_a_to_b(test_path, code_path)
+    FileUtils.rm(file_a)
+    FileUtils.rm(file_b)
+  end
+
+end

spec/gf_definition_spec.rb

@@ -2,16 +2,6 @@
 
 describe "gf definition" do
 
-  def find_definition(string_to_find_by)
-    write_file('starting-file.js', <<-EOF)
-      #{string_to_find_by}
-    EOF
-
-    vim.edit 'starting-file.js'
-    current_file_name.should eq "starting-file.js"
-    vim.command 'AngularGoToFile'
-  end
-
   specify "should be found by same name but without js" do
     setup_filesystem('app/js/poo.js')
     find_definition('poo')
@@ -41,5 +31,17 @@ def find_definition(string_to_find_by)
     find_definition('poo')
     current_file_name.should eq "./app/js/piles-of-poo.js"
   end
-end
 
+private
+
+  def find_definition(string_to_find_by)
+    write_file('starting-file.js', <<-EOF)
+      #{string_to_find_by}
+    EOF
+
+    vim.edit 'starting-file.js'
+    current_file_name.should eq "starting-file.js"
+    vim.command 'AngularGoToFile'
+  end
+
+end

spec/gf_file_spec.rb

@@ -2,61 +2,98 @@
 
 describe "gf file" do
 
-  def html_file_at(filename)
-    safe_write_file(filename)
-  end
-
-  def do_gf_from_directive!(template_url = 'my-customer.html')
-    write_file('directive.js', <<-EOF)
-    angular.module('docsTemplateUrlDirective', [])
-      .controller('Controller', ['$scope', function($scope) {
-        $scope.customer = {
-          name: 'Naomi',
-          address: '1600 Amphitheatre'
-        };
-      }])
-      .directive('myCustomer', function() {
-        return {
-          templateUrl: '#{template_url}'
-        };
-      });
-    EOF
-
-    vim.edit 'directive.js'
-    current_file_name.should eq "directive.js"
-    vim.normal '/my-cust<CR>'
-    #vim.normal 'gf'
-    vim.command 'AngularGoToFile'
+  specify "default behavior for directive" do
+    html_file_at('my-customer.html')
+    do_gf_from_directive_that_references!('my-customer.html')
+    current_file_name.should eq "my-customer.html"
   end
 
-  specify "default behavior" do
+  specify "default behavior for view" do
     html_file_at('my-customer.html')
-    do_gf_from_directive!
+    do_gf_from_view_that_references!('my-customer.html')
     current_file_name.should eq "my-customer.html"
   end
 
   specify "when html in app/templates and directive references full path" do
     html_file_at('app/templates/my-customer.html')
-    do_gf_from_directive!('app/templates/my-customer.html')
+    do_gf_from_directive_that_references!('app/templates/my-customer.html')
     current_file_name.should eq "app/templates/my-customer.html"
   end
 
   specify "when html in app/templates and directive references path minus app" do
     html_file_at('app/templates/my-customer.html')
-    do_gf_from_directive!('templates/my-customer.html')
+    do_gf_from_directive_that_references!('templates/my-customer.html')
     current_file_name.should eq "app/templates/my-customer.html"
   end
 
-  specify "when html in app subdirectory" do
+  specify "when html in app/templates and view references path minus app" do
+    html_file_at('app/templates/my-customer.html')
+    do_gf_from_view_that_references!('templates/my-customer.html')
+    current_file_name.should eq "app/templates/my-customer.html"
+  end
+
+  specify "when html in app/views and view references path minus app" do
+    html_file_at('app/views/my-customer.html')
+    do_gf_from_view_that_references!('views/my-customer.html')
+    current_file_name.should eq "app/views/my-customer.html"
+  end
+
+  specify "when html in app subdirectory and directive references path minus app" do
     html_file_at('app/my-customer.html')
-    do_gf_from_directive!
+    do_gf_from_directive_that_references!('my-customer.html')
     current_file_name.should eq "app/my-customer.html"
   end
 
-  specify "when html in random unsupported subdirectory" do
+  specify "when html in random unsupported subdirectory that directive is not referencing" do
     html_file_at('wut/my-customer.html')
-    do_gf_from_directive!
+    do_gf_from_directive_that_references!('my-customer.html')
     current_file_name.should eq "directive.js"
   end
 
+private
+
+  def html_file_at(filename)
+    safe_write_file(filename)
+  end
+
+  def do_gf(starting_file, starting_file_contents)
+    write_file(starting_file, starting_file_contents)
+
+    vim.edit starting_file
+    current_file_name.should eq starting_file
+    vim.normal '/my-cust<CR>'
+    #vim.normal 'gf'
+    vim.command 'AngularGoToFile'
+  end
+
+  def do_gf_from_directive_that_references!(template_url)
+    starting_file = 'directive.js'
+
+    do_gf(starting_file, <<-EOF)
+      angular.module('docsTemplateUrlDirective', [])
+        .controller('Controller', ['$scope', function($scope) {
+          $scope.customer = {
+            name: 'Naomi',
+            address: '1600 Amphitheatre'
+          };
+        }])
+        .directive('myCustomer', function() {
+          return {
+            templateUrl: '#{template_url}'
+          };
+        });
+    EOF
+  end
+
+  def do_gf_from_view_that_references!(template_url)
+    starting_file = 'hot.html'
+
+    do_gf(starting_file, <<-EOF)
+      <div class="totally-awesome"
+        ng-if="readyToRock"
+        ng-include src="'#{template_url}'">
+      </div
+    EOF
+  end
+
 end