From 58ac259dc512ab8e288ef9385b0de5154f3e32c4 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Sat, 15 Aug 2015 09:24:17 +0900
Subject: [PATCH] Improve error messages

---
 autoload/neosnippet/parser.vim | 10 +++++-----
 autoload/neosnippet/util.vim   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/autoload/neosnippet/parser.vim b/autoload/neosnippet/parser.vim
index cfbe620..517af6f 100644
--- a/autoload/neosnippet/parser.vim
+++ b/autoload/neosnippet/parser.vim
@@ -141,7 +141,7 @@ function! s:parse_snippet_name(snippet_file, line, linenr, dup_check) "{{{
   if has_key(a:dup_check, snippet_dict.name)
     let dup = a:dup_check[snippet_dict.name]
     call neosnippet#util#print_error(printf(
-          \ 'Warning: %s:%d is overriding `%s` from %s:%d',
+          \ '%s:%d is overriding `%s` from %s:%d',
           \ a:snippet_file, a:linenr, snippet_dict.name,
           \ dup.action__path, dup.action__line))
     call neosnippet#util#print_error(printf(
@@ -178,18 +178,18 @@ function! s:add_snippet_attribute(snippet_file, line, linenr, snippet_dict) "{{{
           \ '^options\s\+\zs.*$'), '[,[:space:]]\+')
       if !has_key(a:snippet_dict.options, option)
         call neosnippet#util#print_error(
-              \ printf('[neosnippet] %s:%d', a:snippet_file, a:linenr))
+              \ printf('%s:%d', a:snippet_file, a:linenr))
         call neosnippet#util#print_error(
-              \ printf('[neosnippet] Invalid option name : "%s"', option))
+              \ printf('Invalid option name : "%s"', option))
       else
         let a:snippet_dict.options[option] = 1
       endif
     endfor
   else
     call neosnippet#util#print_error(
-          \ printf('[neosnippet] %s:%d', a:snippet_file, a:linenr))
+          \ printf('%s:%d', a:snippet_file, a:linenr))
     call neosnippet#util#print_error(
-          \ printf('[neosnippet] Invalid syntax : "%s"', a:line))
+          \ printf('Invalid syntax : "%s"', a:line))
   endif
 endfunction"}}}
 
diff --git a/autoload/neosnippet/util.vim b/autoload/neosnippet/util.vim
index c855260..ece720c 100644
--- a/autoload/neosnippet/util.vim
+++ b/autoload/neosnippet/util.vim
@@ -107,7 +107,7 @@ function! neosnippet#util#get_cur_text() "{{{
         \         '^.*\%' . col('.') . 'c' . (mode() ==# 'i' ? '' : '.'))
 endfunction"}}}
 function! neosnippet#util#print_error(string) "{{{
-  echohl Error | echomsg a:string | echohl None
+  echohl Error | echomsg '[neosnippet] ' . a:string | echohl None
 endfunction"}}}
 
 function! neosnippet#util#parse_options(args, options_list) "{{{