Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit28acf63

Browse files
authored
Merge branch 'main' into main
2 parents2fcdde8 +ef59264 commit28acf63

File tree

1 file changed

+44
-44
lines changed

1 file changed

+44
-44
lines changed

‎Extension/src/LanguageServer/extension.ts‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,50 @@ export async function activate(): Promise<void> {
169169
}
170170
}
171171

172+
if(newCppSettings((vscode.workspace.workspaceFolders&&vscode.workspace.workspaceFolders.length>0) ?vscode.workspace.workspaceFolders[0]?.uri :undefined).intelliSenseEngine==="Disabled"){
173+
thrownewError(intelliSenseDisabledError);
174+
}else{
175+
console.log("activating extension");
176+
sendActivationTelemetry();
177+
constcheckForConflictingExtensions:PersistentState<boolean>=newPersistentState<boolean>("CPP."+util.packageJson.version+".checkForConflictingExtensions",true);
178+
if(checkForConflictingExtensions.Value){
179+
checkForConflictingExtensions.Value=false;
180+
constclangCommandAdapterActive:boolean=vscode.extensions.all.some((extension:vscode.Extension<any>,index:number,array:Readonly<vscode.Extension<any>[]>):boolean=>
181+
extension.isActive&&extension.id==="mitaki28.vscode-clang");
182+
if(clangCommandAdapterActive){
183+
telemetry.logLanguageServerEvent("conflictingExtension");
184+
}
185+
}
186+
}
187+
188+
console.log("starting language server");
189+
clients=newClientCollection();
190+
ui=getUI();
191+
192+
// There may have already been registered CustomConfigurationProviders.
193+
// Request for configurations from those providers.
194+
clients.forEach(client=>{
195+
getCustomConfigProviders().forEach(provider=>client.onRegisterCustomConfigurationProvider(provider));
196+
});
197+
198+
disposables.push(vscode.workspace.onDidChangeConfiguration(onDidChangeSettings));
199+
disposables.push(vscode.window.onDidChangeActiveTextEditor(onDidChangeActiveTextEditor));
200+
ui.activeDocumentChanged();// Handle already active documents (for non-cpp files that we don't register didOpen).
201+
disposables.push(vscode.window.onDidChangeTextEditorSelection(onDidChangeTextEditorSelection));
202+
disposables.push(vscode.window.onDidChangeVisibleTextEditors(onDidChangeVisibleTextEditors));
203+
204+
updateLanguageConfigurations();
205+
206+
reportMacCrashes();
207+
208+
vcpkgDbPromise=initVcpkgDatabase();
209+
210+
clients.ActiveClient.notifyWhenLanguageClientReady(()=>{
211+
intervalTimer=global.setInterval(onInterval,2500);
212+
});
213+
214+
registerCommands();
215+
172216
taskProvider=vscode.tasks.registerTaskProvider(CppBuildTaskProvider.CppBuildScriptType,cppBuildTaskProvider);
173217

174218
vscode.tasks.onDidStartTask(event=>{
@@ -229,55 +273,11 @@ export async function activate(): Promise<void> {
229273
}
230274
});
231275

232-
if(newCppSettings((vscode.workspace.workspaceFolders&&vscode.workspace.workspaceFolders.length>0) ?vscode.workspace.workspaceFolders[0]?.uri :undefined).intelliSenseEngine==="Disabled"){
233-
thrownewError(intelliSenseDisabledError);
234-
}else{
235-
console.log("activating extension");
236-
sendActivationTelemetry();
237-
constcheckForConflictingExtensions:PersistentState<boolean>=newPersistentState<boolean>("CPP."+util.packageJson.version+".checkForConflictingExtensions",true);
238-
if(checkForConflictingExtensions.Value){
239-
checkForConflictingExtensions.Value=false;
240-
constclangCommandAdapterActive:boolean=vscode.extensions.all.some((extension:vscode.Extension<any>,index:number,array:Readonly<vscode.Extension<any>[]>):boolean=>
241-
extension.isActive&&extension.id==="mitaki28.vscode-clang");
242-
if(clangCommandAdapterActive){
243-
telemetry.logLanguageServerEvent("conflictingExtension");
244-
}
245-
}
246-
}
247-
248-
console.log("starting language server");
249-
clients=newClientCollection();
250-
ui=getUI();
251-
252276
// Log cold start.
253277
constactiveEditor:vscode.TextEditor|undefined=vscode.window.activeTextEditor;
254278
if(activeEditor){
255279
clients.timeTelemetryCollector.setFirstFile(activeEditor.document.uri);
256280
}
257-
258-
// There may have already been registered CustomConfigurationProviders.
259-
// Request for configurations from those providers.
260-
clients.forEach(client=>{
261-
getCustomConfigProviders().forEach(provider=>client.onRegisterCustomConfigurationProvider(provider));
262-
});
263-
264-
disposables.push(vscode.workspace.onDidChangeConfiguration(onDidChangeSettings));
265-
disposables.push(vscode.window.onDidChangeActiveTextEditor(onDidChangeActiveTextEditor));
266-
ui.activeDocumentChanged();// Handle already active documents (for non-cpp files that we don't register didOpen).
267-
disposables.push(vscode.window.onDidChangeTextEditorSelection(onDidChangeTextEditorSelection));
268-
disposables.push(vscode.window.onDidChangeVisibleTextEditors(onDidChangeVisibleTextEditors));
269-
270-
updateLanguageConfigurations();
271-
272-
reportMacCrashes();
273-
274-
vcpkgDbPromise=initVcpkgDatabase();
275-
276-
clients.ActiveClient.notifyWhenLanguageClientReady(()=>{
277-
intervalTimer=global.setInterval(onInterval,2500);
278-
});
279-
280-
registerCommands();
281281
}
282282

283283
exportfunctionupdateLanguageConfigurations():void{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp