Skip to content

Commit

Permalink
chore: Prepare for 243 bump: move addListeners to SDK compat (#6781)
Browse files Browse the repository at this point in the history
  • Loading branch information
tpasternak authored Sep 23, 2024
1 parent 5f0dd68 commit 46277d1
Show file tree
Hide file tree
Showing 8 changed files with 237 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
import com.google.idea.blaze.base.sync.data.BlazeProjectDataManager;
import com.google.idea.blaze.base.vcs.VcsSyncListener;
import com.google.idea.common.util.Transactions;
import com.google.idea.sdkcompat.general.AsyncVfsEventsPostProcessorCompat;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.components.ComponentManagerEx;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.AdditionalLibraryRootsProvider;
Expand Down Expand Up @@ -66,8 +68,7 @@ public static ExternalLibraryManager getInstance(Project project) {
this.project = project;
this.duringBlazeSync = false;
this.libraries = ImmutableMap.of();
AsyncVfsEventsPostProcessor.getInstance()
.addListener(
AsyncVfsEventsPostProcessorCompat.addListener(
events -> {
if (duringBlazeSync || libraries.isEmpty()) {
return;
Expand All @@ -81,7 +82,8 @@ public static ExternalLibraryManager getInstance(Project project) {
libraries.values().forEach(library -> library.removeInvalidFiles(deletedFiles));
}
},
this);
this,
project);
}

@Nullable
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright 2024 The Bazel Authors. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.idea.sdkcompat.general;

import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.vfs.AsyncVfsEventsListener;
import com.intellij.vfs.AsyncVfsEventsPostProcessor;

// #api242
public class AsyncVfsEventsPostProcessorCompat {
private AsyncVfsEventsPostProcessorCompat(){

}

public static void addListener(AsyncVfsEventsListener listener, Disposable disposable, Project project) {
AsyncVfsEventsPostProcessor.getInstance().addListener(listener, disposable);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright 2024 The Bazel Authors. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.idea.sdkcompat.general;

import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.vfs.AsyncVfsEventsListener;
import com.intellij.vfs.AsyncVfsEventsPostProcessor;

// #api242
public class AsyncVfsEventsPostProcessorCompat {
private AsyncVfsEventsPostProcessorCompat(){

}

public static void addListener(AsyncVfsEventsListener listener, Disposable disposable, Project project) {
AsyncVfsEventsPostProcessor.getInstance().addListener(listener, disposable);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright 2024 The Bazel Authors. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.idea.sdkcompat.general;

import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.vfs.AsyncVfsEventsListener;
import com.intellij.vfs.AsyncVfsEventsPostProcessor;

// #api242
public class AsyncVfsEventsPostProcessorCompat {
private AsyncVfsEventsPostProcessorCompat(){

}

public static void addListener(AsyncVfsEventsListener listener, Disposable disposable, Project project) {
AsyncVfsEventsPostProcessor.getInstance().addListener(listener, disposable);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright 2024 The Bazel Authors. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.idea.sdkcompat.general;

import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.vfs.AsyncVfsEventsListener;
import com.intellij.vfs.AsyncVfsEventsPostProcessor;

// #api242
public class AsyncVfsEventsPostProcessorCompat {
private AsyncVfsEventsPostProcessorCompat(){

}

public static void addListener(AsyncVfsEventsListener listener, Disposable disposable, Project project) {
AsyncVfsEventsPostProcessor.getInstance().addListener(listener, disposable);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright 2024 The Bazel Authors. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.idea.sdkcompat.general;

import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.vfs.AsyncVfsEventsListener;
import com.intellij.vfs.AsyncVfsEventsPostProcessor;

// #api242
public class AsyncVfsEventsPostProcessorCompat {
private AsyncVfsEventsPostProcessorCompat(){

}

public static void addListener(AsyncVfsEventsListener listener, Disposable disposable, Project project) {
AsyncVfsEventsPostProcessor.getInstance().addListener(listener, disposable);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright 2024 The Bazel Authors. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.idea.sdkcompat.general;

import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.vfs.AsyncVfsEventsListener;
import com.intellij.vfs.AsyncVfsEventsPostProcessor;

// #api242
public class AsyncVfsEventsPostProcessorCompat {
private AsyncVfsEventsPostProcessorCompat(){

}

public static void addListener(AsyncVfsEventsListener listener, Disposable disposable, Project project) {
AsyncVfsEventsPostProcessor.getInstance().addListener(listener, disposable);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright 2024 The Bazel Authors. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.idea.sdkcompat.general;

import com.intellij.openapi.Disposable;
import com.intellij.openapi.components.ComponentManagerEx;
import com.intellij.openapi.project.Project;
import com.intellij.vfs.AsyncVfsEventsListener;
import com.intellij.vfs.AsyncVfsEventsPostProcessor;

// #api242
public class AsyncVfsEventsPostProcessorCompat {
private AsyncVfsEventsPostProcessorCompat(){

}

public static void addListener(AsyncVfsEventsListener listener, Disposable disposable, Project project) {
AsyncVfsEventsPostProcessor.getInstance().addListener(listener, ((ComponentManagerEx)project).getCoroutineScope());
}
}

0 comments on commit 46277d1

Please sign in to comment.