From 8121df576e71b42dc3b2e03b89dadd64656a92b9 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 7 Apr 2020 12:01:05 -0700 Subject: [PATCH] =?UTF-8?q?Use=20=E2=80=98nxml-mode=E2=80=99=20for=20?= =?UTF-8?q?=E2=80=98.proj=E2=80=99=20and=20=E2=80=98.targets=E2=80=99=20fi?= =?UTF-8?q?les?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both of these file types are used for MSBuild. --- oni-csharp/oni-csharp.el | 8 +++++++- test/integration/oni-csharp.bats | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/oni-csharp/oni-csharp.el b/oni-csharp/oni-csharp.el index d22fb28..64124af 100644 --- a/oni-csharp/oni-csharp.el +++ b/oni-csharp/oni-csharp.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2020.0327.170006 +;; Version: 2020.0407.114436 ;; Package-Requires: (csharp-mode omnisharp oni-company oni-flycheck oni-yasnippet oni-hydra oni-fci smartparens) ;; This program is free software; you can redistribute it and/or modify @@ -167,6 +167,12 @@ _cs_: Solution ^^ _mr_: Reload Solution ;;;###autoload (add-to-list 'auto-mode-alist '("\\.xaml\\'" . nxml-mode)) +;;;###autoload +(add-to-list 'auto-mode-alist '("\\.targets\\'" . nxml-mode)) + +;;;###autoload +(add-to-list 'auto-mode-alist '("\\.proj\\'". nxml-mode)) + ;;;###autoload (add-to-list 'auto-mode-alist '("\\.csproj\\'" . nxml-mode)) diff --git a/test/integration/oni-csharp.bats b/test/integration/oni-csharp.bats index bdfcbd0..ba26d59 100644 --- a/test/integration/oni-csharp.bats +++ b/test/integration/oni-csharp.bats @@ -29,3 +29,23 @@ [[ "$output" == *"nxml-mode" ]] } + +@test "Opening a .proj fiile loads nxml-mode" { + run emacs -batch -l package -f package-initialize \ + -visit test.proj \ + -eval "(prin1 major-mode)" + + echo "$output" + + [[ "$output" == *"nxml-mode" ]] +} + +@test "Opening a .targets file loads nxml-mode" { + run emacs -batch -l package -f packaeg-initialize \ + -visit test.targets \ + -eval "(prin1 major-mode)" + + echo "$output" + + [[ "$output" == *"nxml-mode" ]] +}