Rework completion interfaces
- Use same interface type in a generic interactive completions in a method level and option value level. - Change CompletionResolver to have same function signature as with options and use CompletionContext to keep relevant information. - Fixes #449
This commit is contained in:
@@ -1,3 +1,18 @@
|
||||
/*
|
||||
* Copyright 2022 the original author or authors.
|
||||
*
|
||||
* 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
|
||||
*
|
||||
* https://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 org.springframework.shell.boot;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -11,7 +26,7 @@ import org.springframework.shell.command.ArgumentHeaderMethodArgumentResolver;
|
||||
import org.springframework.shell.command.CommandContextMethodArgumentResolver;
|
||||
import org.springframework.shell.command.CommandExecution.CommandExecutionHandlerMethodArgumentResolvers;
|
||||
import org.springframework.shell.completion.CompletionResolver;
|
||||
import org.springframework.shell.completion.DefaultCompletionResolver;
|
||||
import org.springframework.shell.completion.RegistrationOptionsCompletionResolver;
|
||||
import org.springframework.shell.config.ShellConversionServiceSupplier;
|
||||
import org.springframework.shell.standard.ShellOptionMethodArgumentResolver;
|
||||
|
||||
@@ -20,7 +35,7 @@ public class ParameterResolverAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
public CompletionResolver defaultCompletionResolver() {
|
||||
return new DefaultCompletionResolver();
|
||||
return new RegistrationOptionsCompletionResolver();
|
||||
}
|
||||
|
||||
@Bean
|
||||
|
||||
Reference in New Issue
Block a user