Skip to content

Commit

Permalink
fix(#375): fix case sensitivity issue with one of the files
Browse files Browse the repository at this point in the history
  • Loading branch information
tanvirtin committed Jan 25, 2025
1 parent af86d77 commit a55cd22
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Enable live blame annotations directly in your editor to see the author and comm
> Releases prior to the major versions will no longer be maintained.
> Branch `v1.0.x` contains several new features and massive optimizations but unfortunately also contains several breaking and deprecated changes.
> For the time being the main branch will still be following `v0.2.x` while core users slowly migrate to `v1.0.x` without breaking their current workflow.
> New users please use tag `v1.0.1` or branch `v1.0.x` for the latest changes!
> New users please use tag `v1.0.2` or branch `v1.0.x` for the latest changes!
---

Expand All @@ -111,7 +111,7 @@ Using [packer.nvim](https://github.com/wbthomason/packer.nvim)
```lua
use {
'tanvirtin/vgit.nvim', branch = 'v1.0.x',
-- or , tag = 'v1.0.1',
-- or , tag = 'v1.0.2',
requires = { 'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons' },
-- Lazy loading on 'VimEnter' event is necessary.
event = 'VimEnter',
Expand All @@ -124,7 +124,7 @@ Using [lazy.nvim](https://github.com/folke/lazy.nvim)
```lua
{
'tanvirtin/vgit.nvim', branch = 'v1.0.x',
-- or , tag = 'v1.0.1',
-- or , tag = 'v1.0.2',
dependencies = { 'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons' },
-- Lazy loading on 'VimEnter' event is necessary.
event = 'VimEnter',
Expand Down
14 changes: 7 additions & 7 deletions lua/vgit/features/screens/DiffScreen/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ local Window = require('vgit.core.Window')
local Buffer = require('vgit.core.Buffer')
local console = require('vgit.core.console')
local DiffView = require('vgit.ui.views.DiffView')
local KeyHelpBarView = require('vgit.ui.views.KeyHelpBarView')
local Model = require('vgit.features.screens.DiffScreen.Model')
local diff_preview_setting = require('vgit.settings.diff_preview')
local KeymapHelpBarView = require('vgit.ui.views.KeymapHelpBarView')

local DiffScreen = Object:extend()

Expand Down Expand Up @@ -46,20 +46,20 @@ end

function DiffScreen:create_app_bar_view(scene, model)
if model:is_hunk() then return nil end
return KeymapHelpBarView(scene, {
return KeyHelpBarView(scene, {
keymaps = function()
local keymaps = diff_preview_setting:get('keymaps')
if model:is_staged() then
return {
{ 'Unstage Buffer', keymaps['buffer_unstage'] },
{ 'Unstage Hunk', keymaps['buffer_hunk_unstage'] },
{ 'Unstage Buffer', keymaps['buffer_unstage'] },
{ 'Unstage Hunk', keymaps['buffer_hunk_unstage'] },
{ 'Switch to Staged View', keymaps['toggle_view'] },
}
end
return {
{ 'Stage Buffer', keymaps['buffer_stage'] },
{ 'Stage Hunk', keymaps['buffer_hunk_stage'] },
{ 'Reset Buffer', keymaps['reset'] },
{ 'Stage Buffer', keymaps['buffer_stage'] },
{ 'Stage Hunk', keymaps['buffer_hunk_stage'] },
{ 'Reset Buffer', keymaps['reset'] },
{ 'Switch to Unstage View', keymaps['toggle_view'] },
}
end,
Expand Down
4 changes: 2 additions & 2 deletions lua/vgit/features/screens/ProjectCommitScreen/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ local Scene = require('vgit.ui.Scene')
local Object = require('vgit.core.Object')
local console = require('vgit.core.console')
local SimpleView = require('vgit.ui.views.SimpleView')
local KeymapHelpBarView = require('vgit.ui.views.KeyMapHelpBarView')
local KeyHelpBarView = require('vgit.ui.views.KeyHelpBarView')
local Model = require('vgit.features.screens.ProjectCommitScreen.Model')
local project_commit_preview_setting = require('vgit.settings.project_commit_preview')

Expand All @@ -18,7 +18,7 @@ function ProjectCommitScreen:constructor(opts)
name = 'Project Commit Screen',
scene = scene,
model = model,
app_bar_view = KeymapHelpBarView(scene, {
app_bar_view = KeyHelpBarView(scene, {
keymaps = function()
local keymaps = project_commit_preview_setting:get('keymaps')
return { { 'Save Commit', keymaps['save'] } }
Expand Down
4 changes: 2 additions & 2 deletions lua/vgit/features/screens/ProjectDiffScreen/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local Window = require('vgit.core.Window')
local console = require('vgit.core.console')
local DiffView = require('vgit.ui.views.DiffView')
local StatusListView = require('vgit.ui.views.StatusListView')
local KeymapHelpBarView = require('vgit.ui.views.KeymapHelpBarView')
local KeyHelpBarView = require('vgit.ui.views.KeyHelpBarView')
local Model = require('vgit.features.screens.ProjectDiffScreen.Model')
local project_diff_preview_setting = require('vgit.settings.project_diff_preview')

Expand All @@ -24,7 +24,7 @@ function ProjectDiffScreen:constructor(opts)
name = 'Project Diff Screen',
scene = scene,
model = model,
app_bar_view = KeymapHelpBarView(scene, {
app_bar_view = KeyHelpBarView(scene, {
keymaps = function()
local keymaps = project_diff_preview_setting:get('keymaps')
return {
Expand Down
4 changes: 2 additions & 2 deletions lua/vgit/features/screens/ProjectStashScreen/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ local Object = require('vgit.core.Object')
local console = require('vgit.core.console')
local DiffView = require('vgit.ui.views.DiffView')
local StatusListView = require('vgit.ui.views.StatusListView')
local KeymapHelpBarView = require('vgit.ui.views.KeymapHelpBarView')
local KeyHelpBarView = require('vgit.ui.views.KeyHelpBarView')
local Model = require('vgit.features.screens.ProjectStashScreen.Model')
local project_stash_preview_setting = require('vgit.settings.project_stash_preview')

Expand All @@ -21,7 +21,7 @@ function ProjectStashScreen:constructor(opts)
name = 'Stash Screen',
scene = scene,
model = model,
app_bar_view = KeymapHelpBarView(scene, {
app_bar_view = KeyHelpBarView(scene, {
keymaps = function()
local keymaps = project_stash_preview_setting:get('keymaps')
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ local Object = require('vgit.core.Object')
local dimensions = require('vgit.ui.dimensions')
local AppBarComponent = require('vgit.ui.components.AppBarComponent')

local KeymapHelpBarView = Object:extend()
local KeyHelpBarView = Object:extend()

function KeymapHelpBarView:constructor(scene, props, plot)
function KeyHelpBarView:constructor(scene, props, plot)
return {
plot = plot,
scene = scene,
props = props,
}
end

function KeymapHelpBarView:define()
function KeyHelpBarView:define()
self.scene:set(
'app_bar',
AppBarComponent({
Expand All @@ -26,15 +26,15 @@ function KeymapHelpBarView:define()
)
end

function KeymapHelpBarView:get_components()
function KeyHelpBarView:get_components()
return { self.scene:get('app_bar') }
end

function KeymapHelpBarView:mount(opts)
function KeyHelpBarView:mount(opts)
self.scene:get('app_bar'):mount(opts)
end

function KeymapHelpBarView:render()
function KeyHelpBarView:render()
local keymaps = self.props.keymaps()

local text = ''
Expand All @@ -56,4 +56,4 @@ function KeymapHelpBarView:render()
})
end

return KeymapHelpBarView
return KeyHelpBarView

0 comments on commit a55cd22

Please sign in to comment.