forked from qt-creator/qt-creator
		
	Clang: Fix built-in's ExtractFunction action
Since
  Clang: Provide highlighting for identifier under cursor
  commit ca72c29462
the LocalUseMap, used for some refactoring actions, was not updated
anymore. Fall back to the built-in implementation for the LocalUseMap
because it contains pointers to built-in AST that clang obviously can't
provide.
Task-number: QTCREATORBUG-18607
Change-Id: I08762fe457835d4d83aca719febcb3497ee9696b
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
			
			
This commit is contained in:
		@@ -36,6 +36,7 @@
 | 
			
		||||
#include <diagnosticcontainer.h>
 | 
			
		||||
#include <sourcelocationcontainer.h>
 | 
			
		||||
 | 
			
		||||
#include <cpptools/builtincursorinfo.h>
 | 
			
		||||
#include <cpptools/clangdiagnosticconfigsmodel.h>
 | 
			
		||||
#include <cpptools/clangdiagnosticconfigsmodel.h>
 | 
			
		||||
#include <cpptools/compileroptionsbuilder.h>
 | 
			
		||||
@@ -334,11 +335,14 @@ ClangEditorDocumentProcessor::cursorInfo(const CppTools::CursorInfoParams ¶m
 | 
			
		||||
 | 
			
		||||
    const QTextBlock block = params.textCursor.document()->findBlockByNumber(line - 1);
 | 
			
		||||
    column += ClangCodeModel::Utils::extraUtf8CharsShift(block.text(), column);
 | 
			
		||||
    const CppTools::SemanticInfo::LocalUseMap localUses
 | 
			
		||||
        = CppTools::BuiltinCursorInfo::findLocalUses(params.semanticInfo.doc, line, column);
 | 
			
		||||
 | 
			
		||||
    return m_ipcCommunicator.requestReferences(simpleFileContainer(),
 | 
			
		||||
                                               static_cast<quint32>(line),
 | 
			
		||||
                                               static_cast<quint32>(column),
 | 
			
		||||
                                               textDocument());
 | 
			
		||||
                                               textDocument(),
 | 
			
		||||
                                               localUses);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ClangBackEnd::FileContainer ClangEditorDocumentProcessor::fileContainerWithArguments() const
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user