feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils/QmlJS: Move contents of utils/json.{h,cpp} to qmljs

Browse Source 
This is a special version of JSON only used in the QmlJSEditor,
demote it accordingly.

Change-Id: Id21ea16c022fb8554d87e9ba90c3494978e4cd80
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-08-11 16:13:29 +02:00
parent 576769e54c
commit 1818236b2b
11 changed files with 1126 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmljseditor/qmljseditorplugin.cpp
View File

@@ -7,15 +7,16 @@
#include "qmljseditordocument.h"
#include "qmljseditorplugin.h"
#include "qmljseditortr.h"
#include "qmljshighlighter.h"
#include "qmljsoutline.h"
#include "qmljsquickfixassist.h"
#include "qmltaskmanager.h"
#include "quicktoolbar.h"
#include <qmljs/jsoncheck.h>
#include <qmljs/qmljsicons.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <qmljs/qmljsreformatter.h>
#include <qmljstools/qmljstoolsconstants.h>
#include <qmljstools/qmljstoolssettings.h>
#include <qmljstools/qmljscodestylepreferences.h>
@@ -26,18 +27,20 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projecttree.h>
#include <projectexplorer/taskhub.h>
#include <texteditor/command.h>
#include <texteditor/formattexteditor.h>
#include <texteditor/snippets/snippetprovider.h>
#include <texteditor/tabsettings.h>
#include <texteditor/texteditor.h>
#include <texteditor/texteditorconstants.h>
#include <utils/fsengine/fileiconprovider.h>
#include <utils/json.h>
#include <utils/macroexpander.h>
#include <utils/qtcassert.h>
@@ -77,7 +80,7 @@ public:
QPointer<QmlJSEditorDocument> m_currentDocument;
Utils::JsonSchemaManager m_jsonManager{
QmlJS::JsonSchemaManager m_jsonManager{
{ICore::userResourcePath("json/").toString(),
ICore::resourcePath("json/").toString()}};
QmlJSEditorFactory m_qmlJSEditorFactory;
@@ -215,7 +218,7 @@ void QmlJSEditorPlugin::extensionsInitialized()
QmllsSettingsManager::instance()->setupAutoupdate();
}
Utils::JsonSchemaManager *QmlJSEditorPlugin::jsonManager()
QmlJS::JsonSchemaManager *QmlJSEditorPlugin::jsonManager()
{
return &m_instance->d->m_jsonManager;
}

4
src/plugins/qmljseditor/qmljseditorplugin.h
View File

@@ -5,7 +5,7 @@
#include <extensionsystem/iplugin.h>
namespace Utils { class JsonSchemaManager; }
namespace QmlJS { class JsonSchemaManager; }
namespace QmlJSEditor {
class QuickToolBar;
@@ -23,7 +23,7 @@ public:
~QmlJSEditorPlugin() final;
static QmlJSQuickFixAssistProvider *quickFixAssistProvider();
static Utils::JsonSchemaManager *jsonManager();
static QmlJS::JsonSchemaManager *jsonManager();
static QuickToolBar *quickToolBar();
private:

4
src/plugins/qmljseditor/qmljssemanticinfoupdater.cpp
View File

@@ -14,8 +14,6 @@
#include <coreplugin/icore.h>
#include <utils/json.h>
namespace QmlJSEditor {
namespace Internal {
@@ -97,7 +95,7 @@ QmlJSTools::SemanticInfo SemanticInfoUpdater::makeNewSemanticInfo(const QmlJS::D
semanticInfo.setRootScopeChain(QSharedPointer<const ScopeChain>(scopeChain));
if (doc->language() == Dialect::Json) {
Utils::JsonSchema *schema = QmlJSEditorPlugin::jsonManager()->schemaForFile(
JsonSchema *schema = QmlJSEditorPlugin::jsonManager()->schemaForFile(
doc->fileName().toString());
if (schema) {
JsonCheck jsonChecker(doc);