Merge remote-tracking branch 'origin/master' into master-rebranch

swift-ci · swift-ci · commit cb9f46879f5c · 2020-01-21T14:23:39.000-08:00
diff --git a/utils/vim/ftdetect/sil.vim b/utils/vim/ftdetect/sil.vim
@@ -1 +1,9 @@
+" This source file is part of the Swift.org open source project
+"
+" Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+" Licensed under Apache License v2.0 with Runtime Library Exception
+"
+" See https://swift.org/LICENSE.txt for license information
+" See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+
 au BufNewFile,BufRead *.sil set ft=sil
diff --git a/utils/vim/ftdetect/swift.vim b/utils/vim/ftdetect/swift.vim
@@ -1 +1,9 @@
+" This source file is part of the Swift.org open source project
+"
+" Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+" Licensed under Apache License v2.0 with Runtime Library Exception
+"
+" See https://swift.org/LICENSE.txt for license information
+" See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+
 au BufNewFile,BufRead *.swift set ft=swift
diff --git a/utils/vim/ftdetect/swiftgyb.vim b/utils/vim/ftdetect/swiftgyb.vim
@@ -1,2 +1,9 @@
-au BufNewFile,BufRead *.swift.gyb set ft=swiftgyb
+" This source file is part of the Swift.org open source project
+"
+" Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+" Licensed under Apache License v2.0 with Runtime Library Exception
+"
+" See https://swift.org/LICENSE.txt for license information
+" See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
+au BufNewFile,BufRead *.swift.gyb set ft=swiftgyb
diff --git a/utils/vim/ftplugin/swift.vim b/utils/vim/ftplugin/swift.vim
@@ -1,3 +1,11 @@
+" This source file is part of the Swift.org open source project
+"
+" Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+" Licensed under Apache License v2.0 with Runtime Library Exception
+"
+" See https://swift.org/LICENSE.txt for license information
+" See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+
 setlocal comments=s1:/*,mb:*,ex:*/,:///,://
 setlocal expandtab
 setlocal ts=2
diff --git a/utils/vim/ftplugin/swiftgyb.vim b/utils/vim/ftplugin/swiftgyb.vim
@@ -1 +1,9 @@
+" This source file is part of the Swift.org open source project
+"
+" Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+" Licensed under Apache License v2.0 with Runtime Library Exception
+"
+" See https://swift.org/LICENSE.txt for license information
+" See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+
 runtime! ftplugin/swift.vim
diff --git a/utils/vim/syntax/sil.vim b/utils/vim/syntax/sil.vim
@@ -1,3 +1,11 @@
+" This source file is part of the Swift.org open source project
+"
+" Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+" Licensed under Apache License v2.0 with Runtime Library Exception
+"
+" See https://swift.org/LICENSE.txt for license information
+" See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+"
 " Vim syntax file
 " Language: sil
 
diff --git a/utils/vim/syntax/swift.vim b/utils/vim/syntax/swift.vim
@@ -1,3 +1,11 @@
+" This source file is part of the Swift.org open source project
+"
+" Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+" Licensed under Apache License v2.0 with Runtime Library Exception
+"
+" See https://swift.org/LICENSE.txt for license information
+" See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+"
 " Vim syntax file
 " Language: swift
 " Maintainer: Joe Groff <jgroff@apple.com>
diff --git a/utils/vim/syntax/swiftgyb.vim b/utils/vim/syntax/swiftgyb.vim
@@ -1,3 +1,11 @@
+" This source file is part of the Swift.org open source project
+"
+" Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+" Licensed under Apache License v2.0 with Runtime Library Exception
+"
+" See https://swift.org/LICENSE.txt for license information
+" See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+"
 " Vim syntax file
 " Language: gyb on swift
 
