Version 0.41

-   It's recommended to update ctags to version 5.7 or higher
-   The plugin is now activated for C files
-   New value for OmniCpp_SelectFirstItem when the option is equal to
    2 the first item is selected without inserting it to
    the text (patch from Marek Olszewski)
-   Bug when completing union members fixed with ctags 5.7
    (reported by Willem-Jan de Hoog)
-   New option OmniCpp_LocalSearchDecl (patch from Roland Kuck)
-   Bug when tags=something,,somethingelse (reported by Tobias Pflug)
-   Bug with nested structure (reported by Mikhail Daen)
-   Bug where the script fails to detect the type of a variable when
    the ignorecase option is on (reported by Alexey Vakhov)
-   Error message when trying to use completion on a not yet saved
    Vim buffer (reported by Neil Bird)
-   Error message when trying to use completion on an file opened from
    a tselect command (reported by Henrique Andrade)

Author: FromtonRouge

after/ftplugin/c.vim

@@ -0,0 +1,2 @@
+" OmniCppComplete initialization
+call omni#cpp#complete#Init()

autoload/omni/common/debug.vim

@@ -1,6 +1,6 @@
 " Description: Omni completion debug functions
 " Maintainer:  Vissale NEANG
-" Last Change: 25 jun 2006
+" Last Change: 26 sept. 2007
 
 let s:CACHE_DEBUG_TRACE = []
 

autoload/omni/common/utils.vim

@@ -1,6 +1,6 @@
 " Description: Omni completion utils
 " Maintainer:  Vissale NEANG
-" Last Change: 25 jun 2006
+" Last Change: 26 sept. 2007
 
 " For sort numbers in list
 function! omni#common#utils#CompareNumber(i1, i2)

autoload/omni/cpp/complete.vim

@@ -1,6 +1,6 @@
 " Description: Omni completion script for cpp files
 " Maintainer:  Vissale NEANG
-" Last Change: 25 juin 2006
+" Last Change: 27 sept. 2007
 
 if v:version < 700
     echohl WarningMsg
@@ -20,7 +20,6 @@ let s:CACHE_TAG_POPUP_ITEMS = {}
 let s:CACHE_TAG_FILES = {}
 let s:CACHE_TAG_ENV = ''
 let s:CACHE_OVERLOADED_FUNCTIONS = {}
-call garbagecollect()
 
 " Has preview window?
 let s:hasPreviewWindow = match(&completeopt, 'preview')>=0
@@ -287,6 +286,10 @@ function! s:HasATagFileOrTagEnvChanged()
 
     let result = 0
     for tagFile in tagfiles()
+        if tagFile == ""
+            continue
+        endif
+
         if has_key(s:CACHE_TAG_FILES, tagFile)
             let currentFiletime = getftime(tagFile)
             if currentFiletime > s:CACHE_TAG_FILES[tagFile]
@@ -510,6 +513,7 @@ function! omni#cpp#complete#Main(findstart, base)
         endif
     else
         let typeInfo = omni#cpp#items#ResolveItemsTypeInfo(s:contextStack, g:omni#cpp#items#data)
+
         if typeInfo != {}
             if g:omni#cpp#items#data[-1].kind == 'itemScope'
                 " B) SCOPE_COMPLETION_MODE

autoload/omni/cpp/includes.vim

@@ -1,6 +1,6 @@
 " Description: Omni completion script for cpp files
 " Maintainer:  Vissale NEANG
-" Last Change: 25 jun 2006
+" Last Change: 26 sept. 2007
 
 let g:omni#cpp#includes#CACHE_INCLUDES = {}
 let g:omni#cpp#includes#CACHE_FILE_TIME = {}

autoload/omni/cpp/items.vim

@@ -1,6 +1,6 @@
 " Description: Omni completion script for cpp files
 " Maintainer:  Vissale NEANG
-" Last Change: 25 jun 2006
+" Last Change: 26 sept. 2007
 
 " Build the item list of an instruction
 " An item is an instruction between a -> or . or ->* or .*
@@ -296,35 +296,47 @@ function! s:GetTypeInfoOfVariable(contextStack, szVariable, bSearchDecl)
         if tagItem=={}
             return result
         endif
-        if has_key(tagItem, 'typeref')
-            " Maybe the variable is a global var of an
-            " unnamed class, struct or union.
-            " eg:
-            " 1)
+
+        let szCmdWithoutVariable = substitute(omni#cpp#utils#ExtractCmdFromTagItem(tagItem), '\C\<'.a:szVariable.'\>.*', '', 'g')
+        let tokens = omni#cpp#tokenizer#Tokenize(omni#cpp#utils#GetCodeFromLine(szCmdWithoutVariable))
+        let result = omni#cpp#utils#CreateTypeInfo(omni#cpp#utils#ExtractTypeInfoFromTokens(tokens))
+        " TODO: Namespace resolution for result
+
+        if result != {} && result.value==''
+            " result.value==''
+            " eg: 
             " struct
             " {
             " }gVariable;
-            " In this case we need the tags (the patched version)
-            " Note: We can have a named type like this:
-            " 2)
-            " class A
-            " {
-            " }gVariable;
-            if s:IsUnnamedType(tagItem)
-                " It's an unnamed type we are in the case 1)
-                let result = omni#cpp#utils#CreateTypeInfo(tagItem)
-            else
-                " It's not an unnamed type we are in the case 2)
-                let result = omni#cpp#utils#CreateTypeInfo(substitute(tagItem.typeref, '\w\+:', '', 'g'))
+            if has_key(tagItem, 'typeref')
+                " Maybe the variable is a global var of an
+                " unnamed class, struct or union.
+                " eg:
+                " 1)
+                " struct
+                " {
+                " }gVariable;
+                " In this case we need the tags (the patched version)
+                " Note: We can have a named type like this:
+                " 2)
+                " class A
+                " {
+                " }gVariable;
+                if s:IsUnnamedType(tagItem)
+                    " It's an unnamed type we are in the case 1)
+                    let result = omni#cpp#utils#CreateTypeInfo(tagItem)
+                else
+                    " It's not an unnamed type we are in the case 2)
+
+                    " eg: tagItem.typeref = 'struct:MY_STRUCT::MY_SUBSTRUCT'
+                    let szTypeRef = substitute(tagItem.typeref, '^\w\+:', '', '')
+
+                    " eg: szTypeRef = 'MY_STRUCT::MY_SUBSTRUCT'
+                    let result = omni#cpp#utils#CreateTypeInfo(szTypeRef)
+                endif
             endif
-        else
-            let szCmdWithoutVariable = substitute(omni#cpp#utils#ExtractCmdFromTagItem(tagItem), '\C\<'.a:szVariable.'\>.*', '', 'g')
-            let tokens = omni#cpp#tokenizer#Tokenize(omni#cpp#utils#GetCodeFromLine(szCmdWithoutVariable))
-            let result = omni#cpp#utils#CreateTypeInfo(omni#cpp#utils#ExtractTypeInfoFromTokens(tokens))
-            " TODO: Namespace resolution for result
         endif
     endif
-
     return result
 endfunc
 
@@ -439,7 +451,7 @@ function! s:SearchTypeInfoOfDecl(szVariable)
     endwhile
 
     let result = {}
-    if searchdecl(a:szVariable, 0, 1)==0 && !omni#cpp#utils#IsCursorInCommentOrString()
+    if s:LocalSearchDecl(a:szVariable)==0 && !omni#cpp#utils#IsCursorInCommentOrString()
         let tokens = omni#cpp#utils#TokenizeCurrentInstruction()
         let szTypeInfo = s:ExtractTypeInfoFromDecl(tokens)
         if szTypeInfo != ''
@@ -459,12 +471,13 @@ endfunc
 function! s:SearchDecl(szVariable)
     let result = {}
     let originalPos = getpos('.')
-    let searchResult = searchdecl(a:szVariable, 0, 1)
+    let searchResult = s:LocalSearchDecl(a:szVariable)
     if searchResult==0
         " searchdecl() may detect a decl if the variable is in a conditional
         " instruction (if, elseif, while etc...)
         " We have to check if the detected decl is really a decl instruction
         let tokens = omni#cpp#utils#TokenizeCurrentInstruction()
+
         for token in tokens
             " Simple test
             if index(['if', 'elseif', 'while', 'for', 'switch'], token.value)>=0
@@ -562,3 +575,86 @@ function! s:ResolveCast(tokens, startChar, endChar)
 
     return tokens[startIndex+1 : endIndex-1]
 endfunc
+
+" Replacement for build-in function 'searchdecl'
+" It does not require that the upper-level bracket is in the first column.
+" Otherwise it should be equal to 'searchdecl(name, 0, 1)'
+" @param name: name of variable to find declaration for
+function! s:LocalSearchDecl(name)
+
+    if g:OmniCpp_LocalSearchDecl == 0
+        let bUserIgnoreCase = &ignorecase
+
+        " Forcing the noignorecase option
+        " avoid bug when, for example, if we have a declaration like this : "A a;"
+        set noignorecase
+
+        let result = searchdecl(a:name, 0, 1)
+
+        " Restoring user's setting
+        let &ignorecase = bUserIgnoreCase
+
+        return result
+    endif
+
+    let lastpos = getpos('.')
+    let winview = winsaveview()
+    let lastfoldenable = &foldenable
+    let &foldenable = 0
+
+    " We add \C (noignorecase) to 
+    " avoid bug when, for example, if we have a declaration like this : "A a;"
+    let varname = "\\C\\<" . a:name . "\\>"
+
+    " Go to first blank line before begin of highest scope
+    normal 99[{
+    let scopepos = getpos('.')
+    while (line('.') > 1) && (len(split(getline('.'))) > 0)
+        call cursor(line('.')-1, 0)
+    endwhile
+
+    let declpos = [ 0, 0, 0, 0 ]
+    while search(varname, '', scopepos[1]) > 0
+        " Check if we are a string or a comment
+        if omni#cpp#utils#IsCursorInCommentOrString()
+            continue
+        endif
+
+        " Remember match
+        let declpos = getpos('.')
+    endwhile
+    if declpos[1] != 0
+        " We found a match
+        call winrestview(winview)
+        call setpos('.', declpos)
+        let &foldenable = lastfoldenable
+        return 0
+    endif
+
+    while search(varname, '', lastpos[1]) > 0
+        " Check if current scope is ending before variable
+        let old_cur = getpos('.')
+        normal ]}
+        let new_cur = getpos('.')
+        call setpos('.', old_cur)
+        if (new_cur[1] < lastpos[1]) || ((new_cur[1] == lastpos[1]) && (new_cur[2] < lastpos[2]))
+          continue
+        endif
+
+        " Check if we are a string or a comment
+        if omni#cpp#utils#IsCursorInCommentOrString()
+          continue
+        endif
+
+        " We found match
+        call winrestview(winview)
+        call setpos('.', old_cur)
+        let &foldenable = lastfoldenable
+        return 0
+    endwhile
+
+    " No match found.
+    call winrestview(winview)
+    let &foldenable = lastfoldenable
+    return 1
+endfunc

autoload/omni/cpp/maycomplete.vim

@@ -1,6 +1,6 @@
 " Description: Omni completion script for cpp files
 " Maintainer:  Vissale NEANG
-" Last Change: 25 jun 2006
+" Last Change: 26 sept. 2007
 
 " Check if we can use omni completion in the current buffer
 function! s:CanUseOmnicompletion()
@@ -11,12 +11,23 @@ endfunc
 " Return the mapping of omni completion
 function! omni#cpp#maycomplete#Complete()
     let szOmniMapping = "\<C-X>\<C-O>"
-    if !g:OmniCpp_SelectFirstItem
+
+    "   0 = don't select first item
+    "   1 = select first item (inserting it to the text, default vim behaviour)
+    "   2 = select first item (without inserting it to the text)
+    if g:OmniCpp_SelectFirstItem == 0
+        " We have to force the menuone option to avoid confusion when there is
+        " only one popup item
+        set completeopt-=menu
+        set completeopt+=menuone
+        let szOmniMapping .= "\<C-P>"
+    elseif g:OmniCpp_SelectFirstItem == 2
         " We have to force the menuone option to avoid confusion when there is
         " only one popup item
         set completeopt-=menu
         set completeopt+=menuone
         let szOmniMapping .= "\<C-P>"
+        let szOmniMapping .= "\<C-R>=pumvisible() ? \"\\<down>\" : \"\"\<cr>"
     endif
     return szOmniMapping
 endfunc

autoload/omni/cpp/namespaces.vim

@@ -1,6 +1,6 @@
 " Description: Omni completion script for cpp files
 " Maintainer:  Vissale NEANG
-" Last Change: 25 jun 2006
+" Last Change: 26 sept. 2007
 
 let g:omni#cpp#namespaces#CacheResolve = {}
 let g:omni#cpp#namespaces#CacheUsing = {}
@@ -181,7 +181,11 @@ endfunc
 " Get global using namespace map from the current buffer and include files recursively
 function! s:GetAllUsingNamespaceMapFromCurrentBuffer(...)
     let includeGuard = (a:0>0)? a:1 : {}
-    let szFilePath = omni#cpp#utils#ResolveFilePath(getreg('%'))
+
+    let szBufferName = getreg("%")
+    let szFilePath = omni#cpp#utils#ResolveFilePath(szBufferName)
+    let szFilePath = (szFilePath=='')? szBufferName : szFilePath
+
     let namespaceMap = {}
     if has_key(includeGuard, szFilePath)
         return namespaceMap
@@ -217,7 +221,9 @@ function! s:GetAllUsingNamespaceMapFromFile(szFilePath, ...)
     if a:0 >0
         let includeGuard = a:1
     endif
+
     let szFilePath = omni#cpp#utils#ResolveFilePath(a:szFilePath)
+    let szFilePath = (szFilePath=='')? a:szFilePath : szFilePath
 
     let namespaceMap = {}
     if has_key(includeGuard, szFilePath)
@@ -282,6 +288,8 @@ function! omni#cpp#namespaces#GetMapFromBuffer(szFilePath, ...)
     endif
 
     let szFilePath = omni#cpp#utils#ResolveFilePath(a:szFilePath)
+    let szFilePath = (szFilePath=='')? a:szFilePath : szFilePath
+
     if !bUpdate && has_key(g:omni#cpp#namespaces#CacheUsing, szFilePath)
         return copy(g:omni#cpp#namespaces#CacheUsing[szFilePath])
     endif
@@ -640,7 +648,7 @@ function! s:BuildContextStack(namespaces, szCurrentScope)
         if has_key(tagItem, 'inherits')
             let listBaseClass = omni#cpp#utils#GetClassInheritanceList(a:namespaces, omni#cpp#utils#CreateTypeInfo(a:szCurrentScope))
             let result = listBaseClass + result
-        elseif has_key(tagItem, 'kind') && index(['c', 's', 'u'], tagItem.kind[0])>=0
+        elseif has_key(tagItem, 'kind') && index(['c', 's', 'u', 'n'], tagItem.kind[0])>=0
             call insert(result, omni#cpp#utils#ExtractTypeInfoFromTag(tagItem))
         endif
     endif

autoload/omni/cpp/settings.vim

@@ -1,6 +1,6 @@
 " Description: Omni completion script for cpp files
 " Maintainer:  Vissale NEANG
-" Last Change: 25 jun 2006
+" Last Change: 26 sept. 2007
 
 function! omni#cpp#settings#Init()
     " Global scope search on/off
@@ -76,12 +76,21 @@ function! omni#cpp#settings#Init()
         let g:OmniCpp_MayCompleteScope = 0
     endif
 
-    " When completeopt does not contain longest option, this setting allow to not
-    " select the first item
+    " When completeopt does not contain longest option, this setting 
+    " controls the behaviour of the popup menu selection when starting the completion
     "   0 = don't select first item
-    "   1 = select first item
+    "   1 = select first item (inserting it to the text)
+    "   2 = select first item (without inserting it to the text)
     "   default = 0
     if !exists('g:OmniCpp_SelectFirstItem') 
         let g:OmniCpp_SelectFirstItem= 0
     endif
+
+    " Use local search function for variable definitions
+    "   0 = use standard vim search function
+    "   1 = use local search function
+    "   default = 0
+    if !exists('g:OmniCpp_LocalSearchDecl') 
+        let g:OmniCpp_LocalSearchDecl= 0
+    endif
 endfunc

autoload/omni/cpp/tokenizer.vim

@@ -1,6 +1,6 @@
 " Description: Omni completion tokenizer
 " Maintainer:  Vissale NEANG
-" Last Change: 25 jun 2006
+" Last Change: 26 sept. 2007
 " TODO: Generic behaviour for Tokenize()
 
 " From the C++ BNF