@@ -16,10 +16,8 @@ import * as ext from 'vs/workbench/common/contributions';
16
16
import { CodeEditor } from 'vs/editor/browser/codeEditor' ;
17
17
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' ;
18
18
import { IMessageService , Severity } from 'vs/platform/message/common/message' ;
19
- import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace' ;
20
19
import { ITextModelService } from 'vs/editor/common/services/resolverService' ;
21
20
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService' ;
22
- import { IModelService } from 'vs/editor/common/services/modelService' ;
23
21
import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService' ;
24
22
import URI from 'vs/base/common/uri' ;
25
23
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService' ;
@@ -194,8 +192,7 @@ class DirtyDiffWidget extends PeekViewWidget {
194
192
private model : DirtyDiffModel ,
195
193
@IThemeService private themeService : IThemeService ,
196
194
@IInstantiationService private instantiationService : IInstantiationService ,
197
- // @ts -ignore unused injected service
198
- @IMenuService private menuService : IMenuService ,
195
+ @IMenuService menuService : IMenuService ,
199
196
@IKeybindingService private keybindingService : IKeybindingService ,
200
197
@IMessageService private messageService : IMessageService ,
201
198
@IContextKeyService contextKeyService : IContextKeyService
@@ -468,8 +465,6 @@ export class DirtyDiffController implements IEditorContribution {
468
465
469
466
private model : DirtyDiffModel | null = null ;
470
467
private widget : DirtyDiffWidget | null = null ;
471
- // @ts -ignore unused property
472
- private currentLineNumber : number = - 1 ;
473
468
private currentIndex : number = - 1 ;
474
469
private readonly isDirtyDiffVisible : IContextKey < boolean > ;
475
470
private session : IDisposable = EmptyDisposable ;
@@ -480,8 +475,6 @@ export class DirtyDiffController implements IEditorContribution {
480
475
constructor (
481
476
private editor : ICodeEditor ,
482
477
@IContextKeyService contextKeyService : IContextKeyService ,
483
- // @ts -ignore unused injected service
484
- @IThemeService private themeService : IThemeService ,
485
478
@IInstantiationService private instantiationService : IInstantiationService
486
479
) {
487
480
this . enabled = ! contextKeyService . getContextKeyValue ( 'isInDiffEditor' ) ;
@@ -513,9 +506,6 @@ export class DirtyDiffController implements IEditorContribution {
513
506
this . currentIndex = rot ( this . currentIndex + 1 , this . model . changes . length ) ;
514
507
}
515
508
516
- const change = this . model . changes [ this . currentIndex ] ;
517
- this . currentLineNumber = change . modifiedStartLineNumber ;
518
-
519
509
this . widget . showChange ( this . currentIndex ) ;
520
510
}
521
511
@@ -530,9 +520,6 @@ export class DirtyDiffController implements IEditorContribution {
530
520
this . currentIndex = rot ( this . currentIndex - 1 , this . model . changes . length ) ;
531
521
}
532
522
533
- const change = this . model . changes [ this . currentIndex ] ;
534
- this . currentLineNumber = change . modifiedStartLineNumber ;
535
-
536
523
this . widget . showChange ( this . currentIndex ) ;
537
524
}
538
525
@@ -875,13 +862,7 @@ export class DirtyDiffModel {
875
862
constructor (
876
863
private _editorModel : IModel ,
877
864
@ISCMService private scmService : ISCMService ,
878
- // @ts -ignore unused injected service
879
- @IModelService private modelService : IModelService ,
880
865
@IEditorWorkerService private editorWorkerService : IEditorWorkerService ,
881
- // @ts -ignore unused injected service
882
- @IWorkbenchEditorService private editorService : IWorkbenchEditorService ,
883
- // @ts -ignore unused injected service
884
- @IWorkspaceContextService private contextService : IWorkspaceContextService ,
885
866
@ITextModelService private textModelResolverService : ITextModelService
886
867
) {
887
868
this . diffDelayer = new ThrottledDelayer < IChange [ ] > ( 200 ) ;
@@ -1024,12 +1005,8 @@ export class DirtyDiffWorkbenchController implements ext.IWorkbenchContribution,
1024
1005
private disposables : IDisposable [ ] = [ ] ;
1025
1006
1026
1007
constructor (
1027
- // @ts -ignore unused injected service
1028
- @IMessageService private messageService : IMessageService ,
1029
1008
@IWorkbenchEditorService private editorService : IWorkbenchEditorService ,
1030
1009
@IEditorGroupService editorGroupService : IEditorGroupService ,
1031
- // @ts -ignore unused injected service
1032
- @IWorkspaceContextService private contextService : IWorkspaceContextService ,
1033
1010
@IInstantiationService private instantiationService : IInstantiationService
1034
1011
) {
1035
1012
this . disposables . push ( editorGroupService . onEditorsChanged ( ( ) => this . onEditorsChanged ( ) ) ) ;
0 commit comments