Commit Graph

56 Commits

Author SHA1 Message Date
Alexis Murzeau
3268e5f0bc LSP: Add setting to provide initializationOptions to the language server
When the language server is initialized, the Initialize request can contain
user provided data in initializationOptions field.

Allow the user to set data inside. This can be required to let the
language server have some context.

Change-Id: Ib057fdb940c21b3fd032853fb84253d42ad1e321
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-11 22:33:45 +00:00
hjk
68c539bb9d Utils: Replace FileChooser::path() by filePath().toString()
Keep the old method for now to ease downstream porting.

The change is kept mechanical, there's a lot of cleanup possible now
on the user code side.

Change-Id: I936baedd45b7ba057f1c789a1bec896886f48eff
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-04-09 17:45:06 +00:00
Kai Koehne
fda9955df0 Globally disable WindowContextHelpButtonHint
Do set the global application flag AA_DisableWindowContextHelpButton
to avoid having to unset the default WindowContextHelpButtonHint
in every single dialog.

AA_DisableWindowContextHelpButton was added in Qt 5.10.

Change-Id: I21fe8bc5ddfa4c01ec7a799b04bfb6ff1c9d6d86
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-25 13:26:44 +00:00
hjk
d43b793dd8 Core: Introduce a IOptionsPage::setCategoryIconPath
Less noise on the user side.

Change-Id: I34dea09e8a3c8639f5a7db89b22f8b825b946395
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-16 09:53:45 +00:00
Christian Stenger
b6aa4e2370 LanguageClient: Avoid problems with old settings
Empty file pattern entries may end up in a match everything
state, so remove them if they are still present inside old
settings.

Change-Id: Ic388522aa152265b5d10a9e334acd3e7b7032be7
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-10-26 12:35:23 +00:00
David Schulz
28c3f0c31e Python: Add info bar entry to enable pyls
Show an editor info bar entry displaying that the language server for
the current python is disabled and a button to quickly enable the pyls.

Change-Id: I3adb2e7cbfb1a32e35413b0b06dfbe66a0b214af
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-18 05:23:29 +00:00
David Schulz
c8ccfea225 Python: Switch pyls on interpreter change
Change-Id: I458b635986a55003a1e7254e27e2df9667704273
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-18 05:23:10 +00:00
David Schulz
57749e91e8 LanguageClient: allow adding settings via the manager
This adds the possibility to configure language servers
from other plugins.

Change-Id: I33c7d637ddd73dcfc0d02c366b8b9749ac1c2b98
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-23 09:51:41 +00:00
Christian Stenger
a0352f24d0 LanguageClient: Fix compile
Change-Id: I3d105513c2807f4e7aebc705e6628c62acaba192
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-09-10 04:58:28 +00:00
David Schulz
332031d677 LanguageClient: open a document in just one client
Also show a menu when triggering the language client toolbar button that
allows you to manage and switch between different language clients. The
default language server used to open a specific file type is determined
by the order of the servers inside the settings.

Change-Id: Ib1b21dd2c04d4559f538705e6ba229af043e02ae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-09 13:29:33 +00:00
Christian Stenger
d1c226d70b LanguageClient: Fix file path filter handling
Avoid sending files to a language server without a file path,
like temporary generated files.
Only allow this if the file matches the MIME type of the
language server.

Change-Id: Ibf71a7196c387a2c8bf345db24c0005ba8fbdfb1
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-25 07:46:36 +00:00
Leena Miettinen
ea76ca45e4 Language Client: Fix UI text capitalization
Change-Id: I6871bb6f91b6a7dfd8b0a12973e709193d6a8a99
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-25 06:50:27 +00:00
hjk
473a741c9f Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 12:23:26 +00:00
Christian Stenger
66f05586dd LanguageClient: Fix build for older compiler
Amends ed77e10571.

Change-Id: Icd41c65ae308f8862cd9b11ac32f8f8d22e7f6e3
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-05-20 09:05:09 +00:00
Christian Stenger
ed77e10571 LanguageClient: Visualize special trigger characters
Instead of having strange looking cells that appear to be empty
try to cope at least with some common trigger characters and
visualize them.

Change-Id: Id0f696eb47df204756a1387535a15c2a1d75cc30
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-05-17 11:36:22 +00:00
David Schulz
0c5837a111 LanguageClient: Fix crash after disabling client setting
Change-Id: I0f9ec02edc645726764fc9ea9ea1832e40bbef80
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-09 11:07:34 +00:00
David Schulz
0ea840c2bd LanguageClient: add option to start client per project
Some server like rust or haskell require a project at server startup.
Add option that postpones the server start until we can assign a project
to an open file.

Change-Id: Iaa475289e833b27a730a90ea228f5d85ecc30338
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-29 09:52:02 +00:00
David Schulz
5c7d8a20c7 LanguageClient: move setting client relationship to manager
Change-Id: I9bf712227d44eada28abb18bbf641a2bfa835914
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-24 09:01:11 +00:00
David Schulz
b28501e3e9 LanguageClient: remove unneeded forward delaration
Change-Id: I02e8dd07f8f04c82cdf31fc536c7d23924539296
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-04-23 06:44:42 +00:00
David Schulz
ad703e108b LanguageClient: move current settings to manager
In preparation to have relationship between clients, settings and
project to one another in the manager.

Change-Id: I00ae15abe03c54b4a58e429d67d6ff939662cce6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-23 06:44:12 +00:00
Alessandro Portale
da84dd1b6d LanguageClient: Select server entry in settings after "Add"
Indicates what to do after adding a server.

Change-Id: Ia68e2944fa18d031c1b7e2fa93723bd861bfded9
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-04-11 13:26:29 +00:00
David Schulz
d1fd3ea667 LanguageClient: only use BaseSettings in the settings API
Change-Id: Ie2ccda8fe4349f495f31a5d46254b68f6074ac6d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-04 08:18:48 +00:00
David Schulz
dac8262aeb LanguageClient: show icon with assigned server names in toolbar
Change-Id: I44ceeb184812a4c48f042a19197c7f0ffd4299f8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-03 07:09:59 +00:00
David Schulz
7f348c1878 LanguageClient: Compare expanded arguments for stdio clients
Change-Id: I6b33aa6b3ddb03a1965dbda4e7e1e1724299eba1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-02 11:29:47 +00:00
David Schulz
e618b158f8 LanguageClient: return actual settings instead of fallback settings
Change-Id: Ia0734c07ae5894d6c5c3e1f9c78e213f9422b6d8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-02 10:53:43 +00:00
David Schulz
a6f0e564d4 LanguageClient: Add option to start server when needed
Until now all servers where startet on creator startup. Change this
default to start server when first file that matches the configured
filter is opened. Additionally add an option that restores the old
behavior of always on servers.

Change-Id: I595e0ede1cf136cc803181377155bcd58ca1a83c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-03-15 11:31:53 +00:00
Eike Ziller
c53ccceff1 Merge remote-tracking branch 'origin/4.9'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/debugger/debuggerkitinformation.cpp
	src/plugins/languageclient/languageclientmanager.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/kit.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8
2019-03-14 15:51:15 +01:00
David Schulz
bc7134dce5 LanguageClient: Allow macro usage in client settings
Add the macro variable chooser to the name and the arguments of a
server in the settings and expand those values on server startup.

Change-Id: I61b031b8952fff7743e88f1523ed69844a5325d9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-03-14 09:17:34 +00:00
David Schulz
89335266ba LanguageClient: move match function to language filter
Change-Id: I9081d441fa2f48e5a1c5273e2de2620e0b88c4e0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-03-13 12:24:18 +00:00
David Schulz
34de118ee3 LanguageClient: make current settings accessible
Change-Id: Ie56272067a56475b1a61006432dc1fbee4192c9c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-03-13 11:34:02 +00:00
David Schulz
bbbf727272 LanguageClient: fix restart check for stdio clients
Change-Id: I4acb61b48b7ac18423b2e106f1f9ea9b3f7ccb70
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-03-12 13:07:11 +00:00
David Schulz
4420190192 LSP: Visualize server capabilities in settings page
Change-Id: Ib83b8580e9758313285a6145b0925e051268f34b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-02-12 07:12:58 +00:00
David Schulz
93ea656821 LSP: rename BaseClient -> Client
Since BaseClient isn't part of an inheritance hirarchie any more the
Base doesn't make sense now.

Change-Id: I69200b19a22e5a04079e5289a02234af4f56a1bd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-02-04 09:43:22 +00:00
David Schulz
eac1b6059c LSP: separate communication interface and client logic
Change-Id: I7d35fa634287b5f858c4a87aa10f99bf18d1ad07
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-02-04 09:43:11 +00:00
Alessandro Portale
616e19ff9e Fix warning: "Missing emit keyword on signal call"
[-Wclazy-incorrect-emit]

Change-Id: I93bdc6e23cdaccf35c9899ae16870ccc65a54f80
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-01-17 15:54:56 +00:00
Alessandro Portale
d9c05d3d20 Fix warning: "Unused non-trivial variable"
[-Wclazy-unused-non-trivial-variable]

Change-Id: Ia99c3de31fd92205f25624ab60e60370c1aa4538
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2019-01-17 10:55:33 +00:00
Alessandro Portale
b2cea9474c LanguageClient: Modernize
modernize-*

Change-Id: I966de09934b9ba3b0497d1df5744c8c3f826240f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-11-14 08:52:21 +00:00
Eike Ziller
7d3686359a Fix missing translation contexts
Change-Id: I4402157e7991ad0050333a34394b87ff3d6f4a1b
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-25 11:46:57 +00:00
Alessandro Portale
5c114a046d LanguageClient: Use FancyLineEdit in MimeTypeDialog
Adds "Filter" as place holder text and a clear icon.

Change-Id: I24641f4f575cb9af059257b7d8806fd8c843d423
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-22 05:48:58 +00:00
Christian Stenger
49e65ad582 LSP: Sort available MIME types
Makes it easier to find what you are looking for.

Change-Id: I98d083e908c7144ad6aa81cde888ba531ff0be33
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-19 09:01:08 +00:00
David Schulz
170e599a11 LSP: support file pattern filter and multiple mime types for lsp clients
Change-Id: I6d1b6c38d41dfd247c8883e765e5e432dbe53a9e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-18 12:00:40 +00:00
David Schulz
77635c0ec9 LSP: warn on non existing language client executables
Change-Id: Ie996f80f4c4d836970f62f1a174bb92967dfb281
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-17 10:38:20 +00:00
David Schulz
468dcc67cb LSP: remove unused LanguageChooseDelegate
Change-Id: I1003d96e603789a9c627d5ecffb6051722c0862a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-16 08:52:27 +00:00
David Schulz
4a7051213b LSP: Create settings widget based on settings type
Change-Id: I4ecdfa386a33114a9d36d21e02ac5eecd9d8f3b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-16 08:43:48 +00:00
David Schulz
c37bedfb02 LSP: split out settings specific for std io clients
Change-Id: I25eebfc15a9d0d5665e57137f016e54a069ca849
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-15 11:51:10 +00:00
Christian Stenger
b30f82d3fb LanguageClient: Sync settings on plugin initialization
Otherwise we might end up starting a second language server
when opening options page of Language Client plugin and
closing again with 'Ok' without modifying any setting.

Change-Id: I2b16436b92a0d622dc7df1b5fbdaf9f9f8e717a2
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-15 08:23:01 +00:00
David Schulz
df08e1ee3d LSP: Store settings in the settingspage
... and keep just a copy of it in the model. This way we
can easily reset the setting model content to a preedit state
without rereading it from the user settings file.

Change-Id: Id2f094caade7c56eff48fd9abce00d687e607a39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-11 13:15:04 +00:00
Alessandro Portale
e8f28dbef3 LanguageClient: Add an options icon
Server "can" with speech bubble saying "<>".

Change-Id: I7eca0109aa5917f341f6310c8f175b1833ff9c00
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-05 07:42:22 +00:00
David Schulz
f5843a29bc LSP: make fromMap() a non static member function
Change-Id: I24844cae784921e0128f475b792453fa65c566ce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-09-21 07:36:12 +00:00
David Schulz
dc155b407d LSP: rename LanguageClientSettings -> BaseSettings
And move the static init function to a separate class.

Change-Id: I7c924ce72ad74047e6bfdb04fa04a6132050a360
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-20 13:08:16 +00:00