Bug#895629: vim-runtime: includeexpr for Scala files is wrong

[Jeremy Sowden]

Package: vim-runtime
Version: 2:8.0.1453-1
Severity: normal
Tags: patch upstream

Dear Maintainer,

While editing a Scala file, I entered "ctrl-w f" to open the source file for the
class name under the cursor.  Instead of opening another buffer and loading the
new file into it, Vim reported the following errors:

  E115: Missing quote: 'substitute(v:fname,
  E15: Invalid expression: 'substitute(v:fname,

I tracked it down to the includeexpr variable in
/usr/share/vim/vim80/ftplugin/scala.vim:

  setlocal includeexpr='substitute(v:fname,"\\.","/","g")'

The value should not be quoted.  Compare the equivalent from java.vim:

  setlocal includeexpr=substitute(v:fname,'\\.','/','g')

After changing the former to the latter, the errors went away and Vim opened the
new file as expected.

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (990, 'testing'), (900, 'stable'), (500, 'oldoldstable-updates'), (99, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_GB.UTF-8), LANGUAGE=en_GB:en (charmap=UTF-8) (ignored: LC_ALL set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

vim-runtime depends on no packages.

Versions of packages vim-runtime recommends:
ii  vim-gtk [vim]  2:8.0.1453-1+b1
ii  vim-tiny       2:8.0.1453-1+b1

vim-runtime suggests no packages.

-- no debconf information
-------------- next part --------------
--- vim-8.0.1453/runtime/ftplugin/scala.vim.orig	2018-04-13 18:29:03.985204842 +0100
+++ vim-8.0.1453/runtime/ftplugin/scala.vim	2018-04-13 18:29:24.021359561 +0100
@@ -27,7 +27,7 @@
 setlocal shiftwidth=2 softtabstop=2 expandtab
 
 setlocal include='^\s*import'
-setlocal includeexpr='substitute(v:fname,"\\.","/","g")'
+setlocal includeexpr=substitute(v:fname,"\\.","/","g")
 
 setlocal path+=src/main/scala,src/test/scala
 setlocal suffixesadd=.scala