Mercurial > vim

changeset 24832:5e3fa7c7a95f v8.2.2954

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2954: short file name extension for Scala not recognized Commit: https://github.com/vim/vim/commit/6db7b6375a3ea3afef5295b1366896902012e640 Author: Brennon M <d1pl0mat@outlook.com> Date: Sun Jun 6 20:15:53 2021 +0200 patch 8.2.2954: short file name extension for Scala not recognized Problem: Short file name extension for Scala not recognized. Solution: Recognize *.sc. (closes https://github.com/vim/vim/issues/8337)
author Bram Moolenaar <Bram@vim.org>
date Sun, 06 Jun 2021 20:30:03 +0200
parents 34842c8a8793
children d672d5756394
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1496,7 +1496,7 @@ au BufNewFile,BufRead *.sass			setf sass
 au BufNewFile,BufRead *.sa			setf sather
 
 " Scala
-au BufNewFile,BufRead *.scala			setf scala
+au BufNewFile,BufRead *.scala,*.sc		setf scala
 
 " SBT - Scala Build Tool
 au BufNewFile,BufRead *.sbt			setf sbt
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -423,7 +423,7 @@ let s:filename_checks = {
     \ 'sass': ['file.sass'],
     \ 'sather': ['file.sa'],
     \ 'sbt': ['file.sbt'],
-    \ 'scala': ['file.scala'],
+    \ 'scala': ['file.scala', 'file.sc'],
     \ 'scheme': ['file.scm', 'file.ss', 'file.rkt'],
     \ 'scilab': ['file.sci', 'file.sce'],
     \ 'screen': ['.screenrc', 'screenrc'],
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2954,
+/**/
     2953,
 /**/
     2952,