f500ecaffb
If the user had code like "foo.bar" and then entered insert mode after the 'r' in "bar", YCM would cause vim to hang. The problem happened because a sorting task was created that would try to sort on the latest clang result but none would be created because a clang task was not created in this occasion. clang_data_ready_ would remain false and would never be set to true, thus causing an infinite loop in SortingThreadMain since the thread would forever wait on the mutex. This was rectified with better handling of the clang results cache. Now the cache is a full class and it also stores the line & column number of the location for which the results were computed. Better logic is in place for the cache invalidation.
84 lines
2.2 KiB
C++
84 lines
2.2 KiB
C++
// Copyright (C) 2011, 2012 Strahinja Val Markovic <val@markovic.io>
|
|
//
|
|
// This file is part of YouCompleteMe.
|
|
//
|
|
// YouCompleteMe is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// YouCompleteMe is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with YouCompleteMe. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#ifndef CLANGRESULTSCACHE_H_REUWM3RU
|
|
#define CLANGRESULTSCACHE_H_REUWM3RU
|
|
|
|
#include "CompletionData.h"
|
|
|
|
#include <vector>
|
|
#include <boost/thread/locks.hpp>
|
|
#include <boost/thread/shared_mutex.hpp>
|
|
#include <boost/function.hpp>
|
|
#include <boost/config.hpp>
|
|
|
|
namespace YouCompleteMe
|
|
{
|
|
|
|
struct CompletionData;
|
|
|
|
class ClangResultsCache
|
|
{
|
|
public:
|
|
|
|
ClangResultsCache() : line_( -1 ), column_( -1 ) {}
|
|
|
|
bool NewPositionDifferentFromStoredPosition( int new_line, int new_colum )
|
|
const;
|
|
|
|
void ResetWithNewLineAndColumn( int new_line, int new_colum );
|
|
|
|
void SetCompletionDatas( const std::vector< CompletionData > new_completions )
|
|
{
|
|
completion_datas_ = new_completions;
|
|
}
|
|
|
|
#ifndef BOOST_NO_RVALUE_REFERENCES
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wc++98-compat"
|
|
|
|
void SetCompletionDatas( std::vector< CompletionData >&& new_completions )
|
|
{
|
|
completion_datas_ = new_completions;
|
|
}
|
|
|
|
#pragma clang diagnostic pop
|
|
#endif //#ifndef BOOST_NO_RVALUE_REFERENCES
|
|
|
|
template< typename T >
|
|
T OperateOnCompletionDatas(
|
|
boost::function< T( const std::vector< CompletionData >& ) > operation )
|
|
const
|
|
{
|
|
boost::shared_lock< boost::shared_mutex > reader_lock( access_mutex_ );
|
|
return operation( completion_datas_ );
|
|
}
|
|
|
|
private:
|
|
|
|
int line_;
|
|
int column_;
|
|
std::vector< CompletionData > completion_datas_;
|
|
|
|
mutable boost::shared_mutex access_mutex_;
|
|
};
|
|
|
|
} // namespace YouCompleteMe
|
|
|
|
#endif /* end of include guard: CLANGRESULTSCACHE_H_REUWM3RU */
|
|
|