File tree Expand file tree Collapse file tree 4 files changed +24
-5
lines changed
Expand file tree Collapse file tree 4 files changed +24
-5
lines changed Original file line number Diff line number Diff line change 297297 },
298298 {
299299 "command" : " nuxtr.directToggleDevTools" ,
300- "when" : " nuxtr.isNuxtProject"
300+ "when" : " nuxtr.isNuxtProject && !nuxtr.isNuxtTwo "
301301 },
302302 {
303303 "command" : " nuxtr.errorLayout" ,
937937 "command" : " nuxtr.directToggleDevTools" ,
938938 "title" : " Toggle DevTools" ,
939939 "category" : " Nuxtr" ,
940- "when" : " nuxtr.isNuxtProject"
940+ "when" : " nuxtr.isNuxtProject && !nuxtr.isNuxtTwo "
941941 },
942942 {
943943 "command" : " nuxtr.directUpgradeNuxt" ,
Original file line number Diff line number Diff line change @@ -10,8 +10,9 @@ import {
1010 getInstallationCommand ,
1111 runCommand ,
1212 getNuxtVersion ,
13+ isNuxtTwo ,
1314} from "../utils" ;
14- import { updateDevtoolsStatusBar } from "../statusBar" ;
15+ import { updateDevtoolsStatusBar , hideDevtoolsStatusBar } from "../statusBar" ;
1516
1617let mod : any ;
1718let nuxtConfigFile : string ;
@@ -146,14 +147,23 @@ async function nuxtConfigWatcher() {
146147
147148async function nuxtDevToolsHandler ( ) {
148149 const isInstalled = await isDevtoolsInstalled ( ) ;
150+ const nuxtTwo = isNuxtTwo ( ) ;
149151 let isDevtoolsNative = false ;
150152
151153 let nuxtVersion = getNuxtVersion ( ) ;
152154 if ( typeof nuxtVersion === 'string' ) {
153155 isDevtoolsNative = semver . gte ( nuxtVersion , '3.8.0' ) ? true : false ;
154156 }
155157
156- if ( ! isInstalled && ! isDevtoolsNative ) {
158+ if ( nuxtTwo ) {
159+ updateDevtoolsStatusBar ( {
160+ command : '' ,
161+ tooltip : "Nuxt Devtools: Not supported for Nuxt 2" ,
162+ text : "$(nuxt-disabled)" ,
163+ color : new ThemeColor ( "activityBar.inactiveForeground" ) ,
164+ } ) ;
165+ hideDevtoolsStatusBar ( )
166+ } else if ( ! isInstalled && ! isDevtoolsNative ) {
157167 await installDevtools ( ) ;
158168 updateDevtoolsStatusBar ( {
159169 command : "nuxtr.directUpgradeNuxt" ,
Original file line number Diff line number Diff line change 11import { ExtensionContext , commands } from 'vscode' ;
22import { activateExtension , publicCommands } from './extension'
3- import { isNuxtProject } from './utils' ;
3+ import { isNuxtProject , isNuxtTwo } from './utils' ;
44
55export async function activate ( context : ExtensionContext ) {
66 const isNuxt = await isNuxtProject ( ) ;
77
8+
89 commands . executeCommand ( 'setContext' , 'nuxtr.isNuxtProject' , isNuxt ) ;
910
11+
1012 if ( isNuxt ) {
13+ const nuxtTwo = isNuxtTwo ( ) ;
14+ commands . executeCommand ( 'setContext' , 'nuxtr.isNuxtTwo' , nuxtTwo ) ;
15+
1116 await activateExtension ( context ) ;
1217 } else {
1318 publicCommands . forEach ( ( { command, function : commandFunction } ) => {
Original file line number Diff line number Diff line change @@ -44,4 +44,8 @@ export function updateDevtoolsStatusBar(statusBar: DevtoolsStatusBar) {
4444 statusBars . devToolsStatusBar . tooltip = statusBar . tooltip ;
4545 statusBars . devToolsStatusBar . text = statusBar . text ;
4646 statusBars . devToolsStatusBar . color = statusBar . color ;
47+ }
48+
49+ export function hideDevtoolsStatusBar ( ) {
50+ statusBars . devToolsStatusBar . hide ( )
4751}
You can’t perform that action at this time.
0 commit comments